Skip to content

Commit db52e19

Browse files
UbuntuAlex-Welsh
authored andcommitted
wip
1 parent a906c2e commit db52e19

27 files changed

+289
-274
lines changed

.github/workflows/stackhpc-pull-request.yml

Lines changed: 127 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
9797
- name: Linting code 🧪
9898
run: |
99-
ansible-lint -v --force-color -x no-changed-when,risky-file-permissions,unknown-module,run-once,name[template],package-latest etc/kayobe/ansible/.
99+
ansible-lint -v --force-color -x no-changed-when,risky-file-permissions,run-once,name[template],package-latest,yaml,role-name[path] etc/kayobe/ansible/.
100100
101101
# A skipped job is treated as success when used as a required status check.
102102
# The registered required status checks refer to the name of the job in the
@@ -106,129 +106,129 @@ jobs:
106106
# when the parent jobs completed successfully or were skipped. We pass an
107107
# 'if' argument to the called workflow to allow running it conditionally.
108108

109-
build-kayobe-image:
110-
name: Build Kayobe Image
111-
needs:
112-
- check-changes
113-
uses: ./.github/workflows/stackhpc-build-kayobe-image.yml
114-
with:
115-
if: ${{ needs.check-changes.outputs.build-kayobe-image == 'true' }}
116-
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
117-
118-
check-tags:
119-
name: Check container image tags
120-
needs:
121-
- check-changes
122-
- build-kayobe-image
123-
uses: ./.github/workflows/stackhpc-check-tags.yml
124-
with:
125-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
126-
if: ${{ needs.check-changes.outputs.check-tags == 'true' }}
127-
secrets: inherit
128-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
129-
130-
all-in-one-ubuntu-jammy-ovs:
131-
name: aio (Ubuntu Jammy OVS)
132-
needs:
133-
- check-changes
134-
- build-kayobe-image
135-
uses: ./.github/workflows/stackhpc-all-in-one.yml
136-
with:
137-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
138-
os_distribution: ubuntu
139-
os_release: jammy
140-
ssh_username: ubuntu
141-
neutron_plugin: ovs
142-
OS_CLOUD: openstack
143-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
144-
secrets: inherit
145-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
146-
147-
all-in-one-ubuntu-jammy-ovn:
148-
name: aio (Ubuntu Jammy OVN)
149-
needs:
150-
- check-changes
151-
- build-kayobe-image
152-
uses: ./.github/workflows/stackhpc-all-in-one.yml
153-
with:
154-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
155-
os_distribution: ubuntu
156-
os_release: jammy
157-
ssh_username: ubuntu
158-
neutron_plugin: ovn
159-
OS_CLOUD: openstack
160-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
161-
secrets: inherit
162-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
163-
164-
all-in-one-rocky-9-ovs:
165-
name: aio (Rocky 9 OVS)
166-
needs:
167-
- check-changes
168-
- build-kayobe-image
169-
uses: ./.github/workflows/stackhpc-all-in-one.yml
170-
with:
171-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
172-
os_distribution: rocky
173-
os_release: "9"
174-
ssh_username: cloud-user
175-
neutron_plugin: ovs
176-
OS_CLOUD: openstack
177-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
178-
secrets: inherit
179-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
180-
181-
all-in-one-rocky-9-ovn:
182-
name: aio (Rocky 9 OVN)
183-
needs:
184-
- check-changes
185-
- build-kayobe-image
186-
uses: ./.github/workflows/stackhpc-all-in-one.yml
187-
with:
188-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
189-
os_distribution: rocky
190-
os_release: "9"
191-
ssh_username: cloud-user
192-
neutron_plugin: ovn
193-
OS_CLOUD: openstack
194-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
195-
secrets: inherit
196-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
197-
198-
# Test two upgrade scenarios: Ubuntu Jammy OVS and Rocky 9 OVN.
199-
200-
all-in-one-upgrade-ubuntu-jammy-ovs:
201-
name: aio upgrade (Ubuntu Jammy OVS)
202-
needs:
203-
- check-changes
204-
- build-kayobe-image
205-
uses: ./.github/workflows/stackhpc-all-in-one.yml
206-
with:
207-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
208-
os_distribution: ubuntu
209-
os_release: jammy
210-
ssh_username: ubuntu
211-
neutron_plugin: ovs
212-
OS_CLOUD: openstack
213-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
214-
upgrade: true
215-
secrets: inherit
216-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
217-
218-
all-in-one-upgrade-rocky-9-ovn:
219-
name: aio upgrade (Rocky 9 OVN)
220-
needs:
221-
- check-changes
222-
- build-kayobe-image
223-
uses: ./.github/workflows/stackhpc-all-in-one.yml
224-
with:
225-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
226-
os_distribution: rocky
227-
os_release: "9"
228-
ssh_username: cloud-user
229-
neutron_plugin: ovn
230-
OS_CLOUD: openstack
231-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
232-
upgrade: true
233-
secrets: inherit
234-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
109+
# build-kayobe-image:
110+
# name: Build Kayobe Image
111+
# needs:
112+
# - check-changes
113+
# uses: ./.github/workflows/stackhpc-build-kayobe-image.yml
114+
# with:
115+
# if: ${{ needs.check-changes.outputs.build-kayobe-image == 'true' }}
116+
# if: github.repository == 'stackhpc/stackhpc-kayobe-config'
117+
118+
# check-tags:
119+
# name: Check container image tags
120+
# needs:
121+
# - check-changes
122+
# - build-kayobe-image
123+
# uses: ./.github/workflows/stackhpc-check-tags.yml
124+
# with:
125+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
126+
# if: ${{ needs.check-changes.outputs.check-tags == 'true' }}
127+
# secrets: inherit
128+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
129+
130+
# all-in-one-ubuntu-jammy-ovs:
131+
# name: aio (Ubuntu Jammy OVS)
132+
# needs:
133+
# - check-changes
134+
# - build-kayobe-image
135+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
136+
# with:
137+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
138+
# os_distribution: ubuntu
139+
# os_release: jammy
140+
# ssh_username: ubuntu
141+
# neutron_plugin: ovs
142+
# OS_CLOUD: openstack
143+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
144+
# secrets: inherit
145+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
146+
147+
# all-in-one-ubuntu-jammy-ovn:
148+
# name: aio (Ubuntu Jammy OVN)
149+
# needs:
150+
# - check-changes
151+
# - build-kayobe-image
152+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
153+
# with:
154+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
155+
# os_distribution: ubuntu
156+
# os_release: jammy
157+
# ssh_username: ubuntu
158+
# neutron_plugin: ovn
159+
# OS_CLOUD: openstack
160+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
161+
# secrets: inherit
162+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
163+
164+
# all-in-one-rocky-9-ovs:
165+
# name: aio (Rocky 9 OVS)
166+
# needs:
167+
# - check-changes
168+
# - build-kayobe-image
169+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
170+
# with:
171+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
172+
# os_distribution: rocky
173+
# os_release: "9"
174+
# ssh_username: cloud-user
175+
# neutron_plugin: ovs
176+
# OS_CLOUD: openstack
177+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
178+
# secrets: inherit
179+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
180+
181+
# all-in-one-rocky-9-ovn:
182+
# name: aio (Rocky 9 OVN)
183+
# needs:
184+
# - check-changes
185+
# - build-kayobe-image
186+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
187+
# with:
188+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
189+
# os_distribution: rocky
190+
# os_release: "9"
191+
# ssh_username: cloud-user
192+
# neutron_plugin: ovn
193+
# OS_CLOUD: openstack
194+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
195+
# secrets: inherit
196+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
197+
198+
# # Test two upgrade scenarios: Ubuntu Jammy OVS and Rocky 9 OVN.
199+
200+
# all-in-one-upgrade-ubuntu-jammy-ovs:
201+
# name: aio upgrade (Ubuntu Jammy OVS)
202+
# needs:
203+
# - check-changes
204+
# - build-kayobe-image
205+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
206+
# with:
207+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
208+
# os_distribution: ubuntu
209+
# os_release: jammy
210+
# ssh_username: ubuntu
211+
# neutron_plugin: ovs
212+
# OS_CLOUD: openstack
213+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
214+
# upgrade: true
215+
# secrets: inherit
216+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
217+
218+
# all-in-one-upgrade-rocky-9-ovn:
219+
# name: aio upgrade (Rocky 9 OVN)
220+
# needs:
221+
# - check-changes
222+
# - build-kayobe-image
223+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
224+
# with:
225+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
226+
# os_distribution: rocky
227+
# os_release: "9"
228+
# ssh_username: cloud-user
229+
# neutron_plugin: ovn
230+
# OS_CLOUD: openstack
231+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
232+
# upgrade: true
233+
# secrets: inherit
234+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

etc/kayobe/ansible/build-ofed-rocky.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242

4343
- name: Add DOCA host repository package
4444
ansible.builtin.dnf:
45-
name: "https://developer.nvidia.com/downloads/networking/secure/doca-sdk/DOCA_2.8/doca-host-2.8.0-204000_\
46-
{{ stackhpc_pulp_doca_ofed_version }}_rhel9{{ stackhpc_pulp_repo_rocky_9_minor_version }}.x86_64.rpm"
45+
name: https://developer.nvidia.com/downloads/networking/secure/doca-sdk/DOCA_2.8/doca-host-2.8.0-204000_{{ stackhpc_pulp_doca_ofed_version }}_rhel9{{ stackhpc_pulp_repo_rocky_9_minor_version
46+
}}.x86_64.rpm
4747
disable_gpg_check: true
4848

4949
- name: Install DOCA extra packages

etc/kayobe/ansible/cephadm-commands-post.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
- cephadm
88
- cephadm-commands
99
tasks:
10-
- import_role:
10+
- name: Apply Cephadm role
11+
ansible.builtin.import_role:
1112
name: stackhpc.cephadm.commands
1213
vars:
1314
cephadm_commands: "{{ cephadm_commands_post | default([]) }}"

etc/kayobe/ansible/cephadm-commands-pre.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
- cephadm
88
- cephadm-commands
99
tasks:
10-
- import_role:
10+
- name: Apply cephadm role
11+
ansible.builtin.import_role:
1112
name: stackhpc.cephadm.commands
1213
vars:
1314
cephadm_commands: "{{ cephadm_commands_pre | default([]) }}"

etc/kayobe/ansible/cephadm-crush-rules.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
- cephadm
88
- cephadm-crush-rules
99
tasks:
10-
- import_role:
10+
- name: Apply cephadm crush rule role
11+
ansible.builtin.import_role:
1112
name: stackhpc.cephadm.crush_rules

etc/kayobe/ansible/cephadm-deploy.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
- cephadm
88
- cephadm-deploy
99
tasks:
10-
- import_role:
10+
- name: Apply cephadm role
11+
ansible.builtin.import_role:
1112
name: stackhpc.cephadm.cephadm

etc/kayobe/ansible/cephadm-ec-profiles.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
- cephadm
88
- cephadm-ec-profiles
99
tasks:
10-
- import_role:
10+
- name: Apply cephadm EC profiles role
11+
ansible.builtin.import_role:
1112
name: stackhpc.cephadm.ec_profiles

etc/kayobe/ansible/cephadm-gather-keys.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
loop: "{{ kolla_ceph_services | selectattr('required') | map(attribute='keys') | flatten | unique }}"
3333

3434
- name: Generate ceph.conf
35-
command: cephadm shell -- ceph config generate-minimal-conf
35+
ansible.builtin.command: cephadm shell -- ceph config generate-minimal-conf
3636
become: true
3737
register: cephadm_ceph_conf
3838
changed_when: false
3939

4040
- name: Ensure Kolla config directories are present
41-
file:
41+
ansible.builtin.file:
4242
state: directory
4343
path: "{{ kayobe_env_config_path }}/kolla/config/{{ kolla_service_to_key_dir[item.name] }}"
4444
loop: "{{ kolla_ceph_services | selectattr('required') }}"
@@ -51,7 +51,7 @@
5151
key_info: "{{ cephadm_key_info.results | selectattr('item', 'equalto', item.1) | first }}"
5252
cephadm_key: "{{ key_info.stdout }}"
5353
cephadm_user: "{{ item.1 }}"
54-
copy:
54+
ansible.builtin.copy:
5555
# Include a trailing newline.
5656
content: |
5757
{{ cephadm_key }}
@@ -63,7 +63,7 @@
6363
notify: Please add and commit the Kayobe configuration
6464

6565
- name: Save ceph.conf to Kayobe configuration
66-
copy:
66+
ansible.builtin.copy:
6767
# Include a trailing newline.
6868
# Kolla Ansible's merge_configs module does not like the leading tabs in ceph.conf.
6969
content: |
@@ -77,7 +77,7 @@
7777

7878
handlers:
7979
- name: Please add and commit the Kayobe configuration
80-
debug:
80+
ansible.builtin.debug:
8181
msg: >-
8282
Please add and commit the Ceph configuration files and keys in Kayobe
8383
configuration. Remember to encrypt the keys using Ansible Vault.

etc/kayobe/ansible/cephadm-keys.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
- cephadm
88
- cephadm-keys
99
tasks:
10-
- import_role:
10+
- name: Apply cephadm keys role
11+
ansible.builtin.import_role:
1112
name: stackhpc.cephadm.keys

etc/kayobe/ansible/cephadm-pools.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
- cephadm
88
- cephadm-keys
99
tasks:
10-
- import_role:
10+
- name: Apply cephadm pools role
11+
ansible.builtin.import_role:
1112
name: stackhpc.cephadm.pools

0 commit comments

Comments
 (0)