Skip to content

Commit 634407c

Browse files
committed
test check aio-init.sh
1 parent 1db027c commit 634407c

File tree

3 files changed

+94
-85
lines changed

3 files changed

+94
-85
lines changed

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

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -130,56 +130,56 @@ jobs:
130130
secrets: inherit
131131
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
132132

133-
all-in-one-ubuntu-noble-ovn:
134-
name: aio (Ubuntu Noble OVN)
135-
needs:
136-
- check-changes
137-
- build-kayobe-image
138-
uses: ./.github/workflows/stackhpc-all-in-one.yml
139-
with:
140-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
141-
os_distribution: ubuntu
142-
os_release: noble
143-
ssh_username: ubuntu
144-
neutron_plugin: ovn
145-
OS_CLOUD: openstack
146-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
147-
secrets: inherit
148-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
149-
150-
all-in-one-rocky-9-ovs:
151-
name: aio (Rocky 9 OVS)
152-
needs:
153-
- check-changes
154-
- build-kayobe-image
155-
uses: ./.github/workflows/stackhpc-all-in-one.yml
156-
with:
157-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
158-
os_distribution: rocky
159-
os_release: "9"
160-
ssh_username: cloud-user
161-
neutron_plugin: ovs
162-
OS_CLOUD: openstack
163-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
164-
secrets: inherit
165-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
166-
167-
all-in-one-rocky-9-ovn:
168-
name: aio (Rocky 9 OVN)
169-
needs:
170-
- check-changes
171-
- build-kayobe-image
172-
uses: ./.github/workflows/stackhpc-all-in-one.yml
173-
with:
174-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
175-
os_distribution: rocky
176-
os_release: "9"
177-
ssh_username: cloud-user
178-
neutron_plugin: ovn
179-
OS_CLOUD: openstack
180-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
181-
secrets: inherit
182-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
133+
# all-in-one-ubuntu-noble-ovn:
134+
# name: aio (Ubuntu Noble OVN)
135+
# needs:
136+
# - check-changes
137+
# - build-kayobe-image
138+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
139+
# with:
140+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
141+
# os_distribution: ubuntu
142+
# os_release: noble
143+
# ssh_username: ubuntu
144+
# neutron_plugin: ovn
145+
# OS_CLOUD: openstack
146+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
147+
# secrets: inherit
148+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
149+
150+
# all-in-one-rocky-9-ovs:
151+
# name: aio (Rocky 9 OVS)
152+
# needs:
153+
# - check-changes
154+
# - build-kayobe-image
155+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
156+
# with:
157+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
158+
# os_distribution: rocky
159+
# os_release: "9"
160+
# ssh_username: cloud-user
161+
# neutron_plugin: ovs
162+
# OS_CLOUD: openstack
163+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
164+
# secrets: inherit
165+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
166+
167+
# all-in-one-rocky-9-ovn:
168+
# name: aio (Rocky 9 OVN)
169+
# needs:
170+
# - check-changes
171+
# - build-kayobe-image
172+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
173+
# with:
174+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
175+
# os_distribution: rocky
176+
# os_release: "9"
177+
# ssh_username: cloud-user
178+
# neutron_plugin: ovn
179+
# OS_CLOUD: openstack
180+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
181+
# secrets: inherit
182+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
183183

184184
# Test two upgrade scenarios: Ubuntu Jammy to Noble OVN and Rocky 9 OVN.
185185

@@ -201,38 +201,38 @@ jobs:
201201
secrets: inherit
202202
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
203203

204-
all-in-one-upgrade-rocky-9-ovn:
205-
name: aio upgrade (Rocky 9 OVN)
206-
needs:
207-
- check-changes
208-
- build-kayobe-image
209-
uses: ./.github/workflows/stackhpc-all-in-one.yml
210-
with:
211-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
212-
os_distribution: rocky
213-
os_release: "9"
214-
ssh_username: cloud-user
215-
neutron_plugin: ovn
216-
OS_CLOUD: openstack
217-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
218-
upgrade: true
219-
secrets: inherit
220-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
221-
222-
all-in-one-upgrade-rocky-9-ovs:
223-
name: aio upgrade (Rocky 9 OVS)
224-
needs:
225-
- check-changes
226-
- build-kayobe-image
227-
uses: ./.github/workflows/stackhpc-all-in-one.yml
228-
with:
229-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
230-
os_distribution: rocky
231-
os_release: "9"
232-
ssh_username: cloud-user
233-
neutron_plugin: ovs
234-
OS_CLOUD: openstack
235-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
236-
upgrade: true
237-
secrets: inherit
238-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
204+
# all-in-one-upgrade-rocky-9-ovn:
205+
# name: aio upgrade (Rocky 9 OVN)
206+
# needs:
207+
# - check-changes
208+
# - build-kayobe-image
209+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
210+
# with:
211+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
212+
# os_distribution: rocky
213+
# os_release: "9"
214+
# ssh_username: cloud-user
215+
# neutron_plugin: ovn
216+
# OS_CLOUD: openstack
217+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
218+
# upgrade: true
219+
# secrets: inherit
220+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
221+
222+
# all-in-one-upgrade-rocky-9-ovs:
223+
# name: aio upgrade (Rocky 9 OVS)
224+
# needs:
225+
# - check-changes
226+
# - build-kayobe-image
227+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
228+
# with:
229+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
230+
# os_distribution: rocky
231+
# os_release: "9"
232+
# ssh_username: cloud-user
233+
# neutron_plugin: ovs
234+
# OS_CLOUD: openstack
235+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
236+
# upgrade: true
237+
# secrets: inherit
238+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

etc/kayobe/ansible/configure-aio-resources.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
ansible.builtin.script:
4242
cmd: scripts/aio-init.sh
4343
creates: /tmp/.init-runonce
44+
register: test
4445
environment:
4546
KOLLA_OPENSTACK_COMMAND: "{{ venv }}/bin/openstack"
4647
EXT_NET_CIDR: "{{ aio_cidr }}"
@@ -59,3 +60,7 @@
5960
OS_IDENTITY_API_VERSION: "3"
6061
OS_REGION_NAME: RegionOne
6162
OS_AUTH_PLUGIN: password
63+
64+
- name: Display stdout of scripts/aio-init.sh
65+
ansible.builtin.debug:
66+
var: test.stdout

etc/kayobe/ansible/scripts/aio-init.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ EXT_NET_CIDR=${EXT_NET_CIDR:-'10.0.2.0/24'}
3333
EXT_NET_RANGE=${EXT_NET_RANGE:-'start=10.0.2.150,end=10.0.2.199'}
3434
EXT_NET_GATEWAY=${EXT_NET_GATEWAY:-'10.0.2.1'}
3535

36+
echo $EXT_NET_CIDR
37+
echo $EXT_NET_RANGE
38+
echo $EXT_NET_GATEWAY
39+
3640
# Sanitize language settings to avoid commands bailing out
3741
# with "unsupported locale setting" errors.
3842
unset LANG

0 commit comments

Comments
 (0)