Skip to content

Commit 00c5f93

Browse files
authored
Update tfvars to point to SMS
1 parent 3c3b84e commit 00c5f93

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

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

Lines changed: 19 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,7 +97,7 @@ 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

@@ -110,9 +110,9 @@ jobs:
110110
# Must be an Ubuntu Jammy host to successfully build all images
111111
# This MUST NOT be an LVM image. It can cause confusing conficts with the built image.
112112
aio_vm_image = "Ubuntu-22.04"
113-
aio_vm_flavor = "en1.medium"
114-
aio_vm_network = "stackhpc-ci"
115-
aio_vm_subnet = "stackhpc-ci"
113+
aio_vm_flavor = "general.v1.small"
114+
aio_vm_network = "stackhpc-ipv4-geneve"
115+
aio_vm_subnet = "stackhpc-ipv4-geneve-subnet"
116116
aio_vm_interface = "ens3"
117117
EOF
118118
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
@@ -122,8 +122,8 @@ jobs:
122122
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
123123
env:
124124
OS_CLOUD: "openstack"
125-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
126-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
125+
OS_APPLICATION_CREDENTIAL_ID_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
126+
OS_APPLICATION_CREDENTIAL_SECRET_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
127127

128128
- name: Terraform Apply
129129
run: |
@@ -142,8 +142,8 @@ jobs:
142142
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
143143
env:
144144
OS_CLOUD: "openstack"
145-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
146-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
145+
OS_APPLICATION_CREDENTIAL_ID_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
146+
OS_APPLICATION_CREDENTIAL_SECRET_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
147147

148148
- name: Get Terraform outputs
149149
id: tf_outputs
@@ -259,9 +259,9 @@ jobs:
259259
-e local_image_path="/opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.qcow2" \
260260
-e image_name=overcloud-rocky-9-${{ steps.host_image_tag.outputs.host_image_tag }}
261261
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 }}
262+
CLOUDS_YAML_SMS: ${{ secrets.CLOUDS_YAML_SMS }}
263+
OS_APPLICATION_CREDENTIAL_ID_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
264+
OS_APPLICATION_CREDENTIAL_SECRET_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
265265
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
266266

267267
- name: Build an Ubuntu Jammy 22.04 overcloud host image
@@ -313,9 +313,9 @@ jobs:
313313
-e local_image_path="/opt/kayobe/images/overcloud-ubuntu-jammy/overcloud-ubuntu-jammy.qcow2" \
314314
-e image_name=overcloud-ubuntu-jammy-${{ steps.host_image_tag.outputs.host_image_tag }}
315315
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 }}
316+
CLOUDS_YAML_SMS: ${{ secrets.CLOUDS_YAML_SMS }}
317+
OS_APPLICATION_CREDENTIAL_ID_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
318+
OS_APPLICATION_CREDENTIAL_SECRET_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
319319
if: inputs.ubuntu-jammy && steps.build_ubuntu_jammy.outcome == 'success'
320320

321321
- name: Copy logs back
@@ -345,6 +345,6 @@ jobs:
345345
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
346346
env:
347347
OS_CLOUD: openstack
348-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
349-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
348+
OS_APPLICATION_CREDENTIAL_ID_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
349+
OS_APPLICATION_CREDENTIAL_SECRET_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
350350
if: always()

0 commit comments

Comments
 (0)