Use image name

stackhpc · Dec 3, 2024 · b993c1a · b993c1a
1 parent a34f927
commit b993c1a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/overcloud-host-image-build.yml b/.github/workflows/overcloud-host-image-build.yml
@@ -242,6 +242,7 @@ jobs:
           src/kayobe-config/etc/kayobe/ansible/pulp-image-upload.yml \
           -e image_path=/opt/kayobe/images/overcloud-rocky-9 \
           -e image_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
+          -e image_name="kayobe-images" \
           -e os_distribution="rocky" \
           -e os_release="9"
         env:
@@ -294,6 +295,7 @@ jobs:
           src/kayobe-config/etc/kayobe/ansible/pulp-image-upload.yml \
           -e image_path=/opt/kayobe/images/overcloud-ubuntu-jammy \
           -e image_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
+          -e image_name="kayobe-images" \
           -e os_distribution="ubuntu" \
           -e os_release="jammy"
         env:

diff --git a/etc/kayobe/ansible/pulp-image-upload.yml b/etc/kayobe/ansible/pulp-image-upload.yml
@@ -5,8 +5,8 @@
     remote_pulp_url: "{{ stackhpc_release_pulp_url }}"
     remote_pulp_username: "{{ stackhpc_image_repository_username }}"
     remote_pulp_password: "{{ stackhpc_image_repository_password }}"
-    repository_name: "kayobe-images-{{ openstack_release }}-{{ os_distribution }}-{{ os_release }}"
-    pulp_base_path: "kayobe-images/{{ openstack_release }}/{{ os_distribution }}/{{ os_release }}"
+    repository_name: "{{ image_name }}-{{ openstack_release }}-{{ os_distribution }}-{{ os_release }}"
+    pulp_base_path: "{{ image_name }}/{{ openstack_release }}/{{ os_distribution }}/{{ os_release }}"
     file_extension: 'qcow2'
   tasks:
     - name: Print image tag