Merge branch 'rackerlabs:main' into development

sowm9802 · Jan 17, 2025 · af26a26 · af26a26
2 parents 3a4ed22 + c6b9a82
commit af26a26
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git 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
@@ -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
diff --git 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"
 ]
diff --git 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