Skip to content

Commit cde6d43

Browse files
committed
Update tfvars to point to SMS
1 parent 3c3b84e commit cde6d43

File tree

1 file changed

+23
-19
lines changed

1 file changed

+23
-19
lines changed

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

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ on:
1414
secrets:
1515
KAYOBE_VAULT_PASSWORD:
1616
required: true
17-
CLOUDS_YAML:
17+
CLOUDS_YAML_SMS:
1818
required: true
19-
OS_APPLICATION_CREDENTIAL_ID:
19+
OS_APPLICATION_CREDENTIAL_ID_SMS:
2020
required: true
21-
OS_APPLICATION_CREDENTIAL_SECRET:
21+
OS_APPLICATION_CREDENTIAL_SECRET_SMS:
2222
required: true
2323

2424
env:
@@ -97,10 +97,14 @@ jobs:
9797
- name: Generate clouds.yaml
9898
run: |
9999
cat << EOF > clouds.yaml
100-
${{ secrets.CLOUDS_YAML }}
100+
${{ secrets.CLOUDS_YAML_SMS }}
101101
EOF
102102
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
103103

104+
- name: Check networking
105+
run: |
106+
ip a
107+
104108
- name: Generate terraform.tfvars
105109
run: |
106110
cat << EOF > terraform.tfvars
@@ -110,9 +114,9 @@ jobs:
110114
# Must be an Ubuntu Jammy host to successfully build all images
111115
# This MUST NOT be an LVM image. It can cause confusing conficts with the built image.
112116
aio_vm_image = "Ubuntu-22.04"
113-
aio_vm_flavor = "en1.medium"
114-
aio_vm_network = "stackhpc-ci"
115-
aio_vm_subnet = "stackhpc-ci"
117+
aio_vm_flavor = "general.v1.small"
118+
aio_vm_network = "magnum"
119+
aio_vm_subnet = "magnum-subnet"
116120
aio_vm_interface = "ens3"
117121
EOF
118122
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
@@ -122,8 +126,8 @@ jobs:
122126
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
123127
env:
124128
OS_CLOUD: "openstack"
125-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
126-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
129+
OS_APPLICATION_CREDENTIAL_ID_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
130+
OS_APPLICATION_CREDENTIAL_SECRET_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
127131

128132
- name: Terraform Apply
129133
run: |
@@ -142,8 +146,8 @@ jobs:
142146
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
143147
env:
144148
OS_CLOUD: "openstack"
145-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
146-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
149+
OS_APPLICATION_CREDENTIAL_ID_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
150+
OS_APPLICATION_CREDENTIAL_SECRET_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
147151

148152
- name: Get Terraform outputs
149153
id: tf_outputs
@@ -259,9 +263,9 @@ jobs:
259263
-e local_image_path="/opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.qcow2" \
260264
-e image_name=overcloud-rocky-9-${{ steps.host_image_tag.outputs.host_image_tag }}
261265
env:
262-
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
263-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
264-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
266+
CLOUDS_YAML_SMS: ${{ secrets.CLOUDS_YAML_SMS }}
267+
OS_APPLICATION_CREDENTIAL_ID_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
268+
OS_APPLICATION_CREDENTIAL_SECRET_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
265269
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
266270

267271
- name: Build an Ubuntu Jammy 22.04 overcloud host image
@@ -313,9 +317,9 @@ jobs:
313317
-e local_image_path="/opt/kayobe/images/overcloud-ubuntu-jammy/overcloud-ubuntu-jammy.qcow2" \
314318
-e image_name=overcloud-ubuntu-jammy-${{ steps.host_image_tag.outputs.host_image_tag }}
315319
env:
316-
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
317-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
318-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
320+
CLOUDS_YAML_SMS: ${{ secrets.CLOUDS_YAML_SMS }}
321+
OS_APPLICATION_CREDENTIAL_ID_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
322+
OS_APPLICATION_CREDENTIAL_SECRET_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
319323
if: inputs.ubuntu-jammy && steps.build_ubuntu_jammy.outcome == 'success'
320324

321325
- name: Copy logs back
@@ -345,6 +349,6 @@ jobs:
345349
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
346350
env:
347351
OS_CLOUD: openstack
348-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
349-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
352+
OS_APPLICATION_CREDENTIAL_ID_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
353+
OS_APPLICATION_CREDENTIAL_SECRET_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
350354
if: always()

0 commit comments

Comments
 (0)