Skip to content

Commit 87b9ffa

Browse files
committed
add security group and terraform variables
1 parent a36037c commit 87b9ffa

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

.github/workflows/ipa-image-build.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
- name: Generate clouds.yaml
9090
run: |
9191
cat << EOF > clouds.yaml
92-
${{ secrets.CLOUDS_YAML }}
92+
${{ secrets.CLOUDS_YAML_SMS }}
9393
EOF
9494
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
9595

@@ -100,9 +100,9 @@ jobs:
100100
ssh_username = "ubuntu"
101101
aio_vm_name = "skc-ipa-image-builder"
102102
aio_vm_image = "Ubuntu-22.04"
103-
aio_vm_flavor = "en1.large"
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
aio_vm_volume_size = 100
108108
EOF
@@ -113,8 +113,8 @@ jobs:
113113
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
114114
env:
115115
OS_CLOUD: "openstack"
116-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
117-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
116+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
117+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
118118

119119
- name: Terraform Apply
120120
run: |
@@ -133,8 +133,8 @@ jobs:
133133
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
134134
env:
135135
OS_CLOUD: "openstack"
136-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
137-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
136+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
137+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
138138

139139
- name: Get Terraform outputs
140140
id: tf_outputs
@@ -340,6 +340,6 @@ jobs:
340340
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
341341
env:
342342
OS_CLOUD: openstack
343-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
344-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
343+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
344+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
345345
if: always()

terraform/aio/vm.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ resource "openstack_compute_instance_v2" "kayobe-aio" {
6262
flavor_name = var.aio_vm_flavor
6363
config_drive = true
6464
user_data = templatefile("templates/userdata.cfg.tpl", {ssh_public_key = file(var.ssh_public_key)})
65+
security_groups = ["kayobe-runner"]
6566
network {
6667
name = var.aio_vm_network
6768
}

0 commit comments

Comments
 (0)