Skip to content

Commit 015af29

Browse files
MaxBed4dAlex-Welsh
authored andcommitted
Add project image sharing config
1 parent 3aa8e1b commit 015af29

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ jobs:
276276
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
277277
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
278278
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
279+
HOST_IMAGE_BUILD_SHARE_PROJECT_ID: ${{ vars.HOST_IMAGE_BUILD_SHARE_PROJECT_ID }}
279280
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
280281

281282
- name: Upload Rocky Linux 9 overcloud host image to other Dev Cloud (Leafcloud/SMS)
@@ -290,6 +291,7 @@ jobs:
290291
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML_OTHER_CLOUD }}
291292
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_OTHER_CLOUD }}
292293
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_OTHER_CLOUD }}
294+
HOST_IMAGE_BUILD_SHARE_PROJECT_ID: ${{ vars.HOST_IMAGE_BUILD_SHARE_PROJECT_ID_OTHER_CLOUD }}
293295
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
294296

295297
- name: Build an Ubuntu Noble 24.04 overcloud host image
@@ -344,6 +346,7 @@ jobs:
344346
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
345347
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
346348
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
349+
HOST_IMAGE_BUILD_SHARE_PROJECT_ID: ${{ vars.HOST_IMAGE_BUILD_SHARE_PROJECT_ID }}
347350
if: inputs.ubuntu-noble && steps.build_ubuntu_noble.outcome == 'success'
348351

349352
- name: Upload Ubuntu Noble overcloud host image to other Dev Cloud (Leafcloud/SMS)
@@ -358,6 +361,7 @@ jobs:
358361
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML_OTHER_CLOUD }}
359362
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_OTHER_CLOUD }}
360363
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_OTHER_CLOUD }}
364+
HOST_IMAGE_BUILD_SHARE_PROJECT_ID: ${{ vars.HOST_IMAGE_BUILD_SHARE_PROJECT_ID_OTHER_CLOUD }}
361365
if: inputs.ubuntu-noble && steps.build_ubuntu_noble.outcome == 'success'
362366

363367
- name: Copy logs back

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)