Skip to content

Commit 2d9602d

Browse files
committed
Add project image sharing config
1 parent b3ee88b commit 2d9602d

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

.github/workflows/overcloud-host-image-build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ jobs:
280280
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
281281
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
282282
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
283+
HOST_IMAGE_BUILD_SHARE_PROJECT_ID: ${{ vars.HOST_IMAGE_BUILD_SHARE_PROJECT_ID }}
283284
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
284285

285286
- name: Upload Rocky Linux 9 overcloud host image to other Dev Cloud (Leafcloud/SMS)
@@ -294,6 +295,7 @@ jobs:
294295
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML_OTHER_CLOUD }}
295296
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_OTHER_CLOUD }}
296297
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_OTHER_CLOUD }}
298+
HOST_IMAGE_BUILD_SHARE_PROJECT_ID: ${{ vars.HOST_IMAGE_BUILD_SHARE_PROJECT_ID_OTHER_CLOUD }}
297299
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
298300

299301
- name: Build an Ubuntu Jammy 22.04 overcloud host image
@@ -348,6 +350,7 @@ jobs:
348350
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
349351
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
350352
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
353+
HOST_IMAGE_BUILD_SHARE_PROJECT_ID: ${{ vars.HOST_IMAGE_BUILD_SHARE_PROJECT_ID }}
351354
if: inputs.ubuntu-jammy && steps.build_ubuntu_jammy.outcome == 'success'
352355

353356
- name: Upload Ubuntu Jammy overcloud host image to other Dev Cloud (Leafcloud/SMS)
@@ -362,6 +365,7 @@ jobs:
362365
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML_OTHER_CLOUD }}
363366
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_OTHER_CLOUD }}
364367
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_OTHER_CLOUD }}
368+
HOST_IMAGE_BUILD_SHARE_PROJECT_ID: ${{ vars.HOST_IMAGE_BUILD_SHARE_PROJECT_ID_OTHER_CLOUD }}
365369
if: inputs.ubuntu-jammy && steps.build_ubuntu_jammy.outcome == 'success'
366370

367371
- name: Build an Ubuntu Noble 24.04 overcloud host image
@@ -416,6 +420,7 @@ jobs:
416420
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
417421
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
418422
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
423+
HOST_IMAGE_BUILD_SHARE_PROJECT_ID: ${{ vars.HOST_IMAGE_BUILD_SHARE_PROJECT_ID }}
419424
if: inputs.ubuntu-noble && steps.build_ubuntu_noble.outcome == 'success'
420425

421426
- name: Upload Ubuntu Noble overcloud host image to other Dev Cloud (Leafcloud/SMS)
@@ -430,6 +435,7 @@ jobs:
430435
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML_OTHER_CLOUD }}
431436
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_OTHER_CLOUD }}
432437
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_OTHER_CLOUD }}
438+
HOST_IMAGE_BUILD_SHARE_PROJECT_ID: ${{ vars.HOST_IMAGE_BUILD_SHARE_PROJECT_ID_OTHER_CLOUD }}
433439
if: inputs.ubuntu-noble && steps.build_ubuntu_noble.outcome == 'success'
434440

435441

etc/kayobe/ansible/openstack-host-image-upload.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,20 @@
4343
state: present
4444
filename: "{{ local_image_path }}"
4545
visibility: shared
46-
register: image
46+
register: image
4747

4848
- name: Ensure dependencies are installed
4949
pip:
5050
name: python-openstackclient
5151
virtualenv: "{{ ansible_python_interpreter | dirname | dirname }}"
5252

53-
# Allow users in stackhpc-aufn to use these images.
53+
# Add the image to the chosen project
5454
- name: Add image to stackhpc-dev project
55-
command: openstack image add project {{ image.image.id }} 3d279fd978df4b18b2174cf336f25c9b
55+
command: "{{ ansible_python_interpreter | dirname | dirname }}/bin/openstack image add project {{ image.image.id }} '{{ lookup('ansible.builtin.env', 'HOST_IMAGE_BUILD_SHARE_PROJECT_ID') }}'"
56+
57+
# Accept the image in the receiving project
58+
- name: Accept image membership in stackhpc-dev project
59+
command: "{{ ansible_python_interpreter | dirname | dirname }}/bin/openstack image set {{ image.image.id }} --project '{{ lookup('ansible.builtin.env', 'HOST_IMAGE_BUILD_SHARE_PROJECT_ID') }}' --accept"
5660

5761
always:
5862
- name: Remove clouds.yaml

0 commit comments

Comments
 (0)