4343 description : Flavor for the all-in-one VM
4444 type : string
4545 default : en1.medium
46- vm_network :
47- description : Network for the all-in-one VM
48- type : string
49- default : stackhpc-ci
50- vm_subnet :
51- description : Subnet for the all-in-one VM
52- type : string
53- default : stackhpc-ci
5446 OS_CLOUD :
5547 description : Name of cloud in clouds.yaml
5648 type : string
@@ -177,8 +169,8 @@ jobs:
177169 aio_vm_name = "${{ env.VM_NAME }}"
178170 aio_vm_image = "${{ env.VM_IMAGE }}"
179171 aio_vm_flavor = "${{ env.VM_FLAVOR }}"
180- aio_vm_network = "${{ env.VM_NETWORK }}"
181- aio_vm_subnet = "${{ env.VM_SUBNET }}"
172+ aio_vm_network = "${{ vars.HOST_IMAGE_BUILD_NETWORK }}"
173+ aio_vm_subnet = "${{ vars.HOST_IMAGE_BUILD_SUBNET }}"
182174 aio_vm_volume_size = "${{ env.VM_VOLUME_SIZE }}"
183175 aio_vm_tags = ${{ env.VM_TAGS }}
184176 EOF
@@ -188,8 +180,6 @@ jobs:
188180 VM_NAME : " skc-ci-aio-${{ inputs.neutron_plugin }}-${{ github.run_id }}"
189181 VM_IMAGE : ${{ steps.image_name.outputs.image_name }}
190182 VM_FLAVOR : ${{ inputs.vm_flavor }}
191- VM_NETWORK : ${{ inputs.vm_network }}
192- VM_SUBNET : ${{ inputs.vm_subnet }}
193183 VM_INTERFACE : ${{ inputs.vm_interface }}
194184 VM_VOLUME_SIZE : ${{ inputs.upgrade && '65' || '50' }}
195185 VM_TAGS : ' ["skc-ci-aio", "PR=${{ github.event.number }}"]'
@@ -198,7 +188,7 @@ jobs:
198188 run : terraform plan
199189 working-directory : ${{ github.workspace }}/terraform/aio
200190 env :
201- OS_CLOUD : ${{ inputs .OS_CLOUD }}
191+ OS_CLOUD : ${{ vars .OS_CLOUD }}
202192 OS_APPLICATION_CREDENTIAL_ID : ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
203193 OS_APPLICATION_CREDENTIAL_SECRET : ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
204194
@@ -219,7 +209,7 @@ jobs:
219209 exit 1
220210 working-directory : ${{ github.workspace }}/terraform/aio
221211 env :
222- OS_CLOUD : ${{ inputs .OS_CLOUD }}
212+ OS_CLOUD : ${{ vars .OS_CLOUD }}
223213 OS_APPLICATION_CREDENTIAL_ID : ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
224214 OS_APPLICATION_CREDENTIAL_SECRET : ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
225215
@@ -523,7 +513,7 @@ jobs:
523513 run : terraform destroy -auto-approve
524514 working-directory : ${{ github.workspace }}/terraform/aio
525515 env :
526- OS_CLOUD : ${{ inputs .OS_CLOUD }}
516+ OS_CLOUD : ${{ vars .OS_CLOUD }}
527517 OS_APPLICATION_CREDENTIAL_ID : ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
528518 OS_APPLICATION_CREDENTIAL_SECRET : ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
529519 if : always()
0 commit comments