Skip to content

Commit a36037c

Browse files
MaxBed4dMaxBed4d
committed
Amend secrets and update ofed image build tfvars
1 parent a0e776e commit a36037c

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

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

Lines changed: 15 additions & 15 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_SMS:
17+
CLOUDS_YAML:
1818
required: true
19-
OS_APPLICATION_CREDENTIAL_ID_SMS:
19+
OS_APPLICATION_CREDENTIAL_ID:
2020
required: true
21-
OS_APPLICATION_CREDENTIAL_SECRET_SMS:
21+
OS_APPLICATION_CREDENTIAL_SECRET:
2222
required: true
2323

2424
env:
@@ -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_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
126-
OS_APPLICATION_CREDENTIAL_SECRET_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
125+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
126+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ 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_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
146-
OS_APPLICATION_CREDENTIAL_SECRET_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
145+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
146+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ 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_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 }}
262+
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML_SMS }}
263+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
264+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ 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_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 }}
316+
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML_SMS }}
317+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
318+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ 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_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
349-
OS_APPLICATION_CREDENTIAL_SECRET_SMS: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
348+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
349+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
350350
if: always()

‎.github/workflows/package-build-ofed.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
- name: Generate clouds.yaml
7979
run: |
8080
cat << EOF > clouds.yaml
81-
${{ secrets.CLOUDS_YAML }}
81+
${{ secrets.CLOUDS_YAML_SMS }}
8282
EOF
8383
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
8484

@@ -100,9 +100,9 @@ jobs:
100100
ssh_username = "cloud-user"
101101
aio_vm_name = "skc-ofed-builder"
102102
aio_vm_image = "${{ env.VM_IMAGE }}"
103-
aio_vm_flavor = "en1.medium"
104-
aio_vm_network = "stackhpc-ci"
105-
aio_vm_subnet = "stackhpc-ci"
103+
aio_vm_flavor = "general.v1.small"
104+
aio_vm_network = "magnum"
105+
aio_vm_subnet = "magnum-subnet"
106106
aio_vm_interface = "ens3"
107107
EOF
108108
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
@@ -114,8 +114,8 @@ jobs:
114114
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
115115
env:
116116
OS_CLOUD: "openstack"
117-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
118-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
117+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
118+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
119119

120120
- name: Terraform Apply
121121
run: |
@@ -134,8 +134,8 @@ jobs:
134134
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
135135
env:
136136
OS_CLOUD: "openstack"
137-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
138-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
137+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
138+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
139139

140140
- name: Get Terraform outputs
141141
id: tf_outputs
@@ -249,6 +249,6 @@ jobs:
249249
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
250250
env:
251251
OS_CLOUD: openstack
252-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
253-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
252+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
253+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
254254
if: always()

0 commit comments

Comments
 (0)