From dd86b25cfa0033a91bb4ea5d98e4d3d463e67d9b Mon Sep 17 00:00:00 2001
From: niti6869 <63388430+niti6869@users.noreply.github.com>
Date: Wed, 15 Jan 2025 20:53:43 +0530
Subject: [PATCH 1/3] OSPC-202: Increase timeout for instance volume creation
 (#651)

* OSPC-202: timeout Increased for instance volume creation

block_device_allocate_retries count increased from 120 to 180, to give more time for volume creation from large images, without getting timed out.

* OSPC-202: timeout Increased for instance creation

instance_build_timeout increased from 600 to 900, to give more time for Instance creation from large images, without getting timed out.
---
 base-helm-configs/nova/nova-helm-overrides.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/base-helm-configs/nova/nova-helm-overrides.yaml b/base-helm-configs/nova/nova-helm-overrides.yaml
index 3aa6ed12..253c678b 100644
--- a/base-helm-configs/nova/nova-helm-overrides.yaml
+++ b/base-helm-configs/nova/nova-helm-overrides.yaml
@@ -1380,8 +1380,8 @@ conf:
       instance_usage_audit: True
       instance_usage_audit_period: hour
       resume_guests_state_on_host_boot: True
-      instance_build_timeout: 600
-      block_device_allocate_retries: 120
+      instance_build_timeout: 900
+      block_device_allocate_retries: 180
       block_device_allocate_retries_interval: 5
     compute:
       max_disk_devices_to_attach: 8

From af8f34e64a8051643a0f53ea59e3f609ea2de7f0 Mon Sep 17 00:00:00 2001
From: Adam Fabian <adam.fabian@rackspace.com>
Date: Wed, 15 Jan 2025 14:32:53 -0600
Subject: [PATCH 2/3] fix: add neutron image to .original-images.json (#650)

---
 .original-images.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.original-images.json b/.original-images.json
index 2bd6b8ed..79014b1f 100644
--- a/.original-images.json
+++ b/.original-images.json
@@ -5,5 +5,6 @@
   "ghcr.io/rackerlabs/genestack/keystone-rxt:2024.1-ubuntu_jammy-1735886895",
   "docker.io/openstackhelm/barbican:2023.1-ubuntu_jammy",
   "ghcr.io/rackerlabs/genestack/nova-efi:2024.1-ubuntu_jammy-1723129048",
-  "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+  "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy",
+  "docker.io/openstackhelm/neutron:2024.1-ubuntu_jammy"
 ]

From c6b9a82cfe4fd0aaf56357c070cee69d16ca2c9c Mon Sep 17 00:00:00 2001
From: Sowmya Nethi <sowmya.kamavaram@rackspace.com>
Date: Thu, 16 Jan 2025 20:14:00 +0530
Subject: [PATCH 3/3] Rename image from heat-rxt to heat (#652)

* Docs: Adding accelerated computing documentation

* docs: Add Octavia Flavor and Flavorprofile documentation

* Rename image from heat-rxt to heat
---
 .github/workflows/release-heat-rxt.yml | 6 +++---
 .github/workflows/smoke-heat-rxt.yml   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release-heat-rxt.yml b/.github/workflows/release-heat-rxt.yml
index 34dfd88a..2a9428b1 100644
--- a/.github/workflows/release-heat-rxt.yml
+++ b/.github/workflows/release-heat-rxt.yml
@@ -1,5 +1,5 @@
 #
-name: Create and Publish a Heat RXT Image
+name: Create and Publish a Heat Image
 
 on:
   push:
@@ -65,8 +65,8 @@ jobs:
           file: Containerfiles/HeatRXT-Containerfile
           push: true
           tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat-rxt:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }}
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat-rxt:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }}-${{ env.MY_DATE }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }}-${{ env.MY_DATE }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             VERSION=${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }}
diff --git a/.github/workflows/smoke-heat-rxt.yml b/.github/workflows/smoke-heat-rxt.yml
index d4ed8e4c..f038661d 100644
--- a/.github/workflows/smoke-heat-rxt.yml
+++ b/.github/workflows/smoke-heat-rxt.yml
@@ -1,5 +1,5 @@
 #
-name: Run build check for the Heat RXT image
+name: Run build check for the Heat image
 
 on:
   pull_request:
@@ -36,6 +36,6 @@ jobs:
           file: Containerfiles/HeatRXT-Containerfile
           push: false
           tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat-rxt:2024.1-ubuntu_jammy
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat:2024.1-ubuntu_jammy
           build-args: |
             VERSION=2024.1-ubuntu_jammy