provide multi-cloud terraform varsfiles for CI environment

Author: sjpb

.github/workflows/stackhpc.yml

@@ -59,7 +59,6 @@ jobs:
           . environments/.stackhpc/activate
           ansible-playbook ansible/adhoc/generate-passwords.yml
           echo vault_testuser_password: "$TESTUSER_PASSWORD" > $APPLIANCES_ENVIRONMENT_ROOT/inventory/group_vars/all/test_user.yml
-          TODO: move TF vars to correct place
         env:
           TESTUSER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }}
 
@@ -69,14 +68,14 @@ jobs:
           . venv/bin/activate
           . environments/.stackhpc/activate
           cd $APPLIANCES_ENVIRONMENT_ROOT/terraform
-          terraform apply -auto-approve
+          terraform apply -auto-approve -var-file="${{ vars.CI_CLOUD }}.tfvars"
 
       - name: Delete infrastructure if provisioning failed
         run: |
           . venv/bin/activate
           . environments/.stackhpc/activate
           cd $APPLIANCES_ENVIRONMENT_ROOT/terraform
-          terraform destroy -auto-approve
+          terraform destroy -auto-approve -var-file="${{ vars.CI_CLOUD }}.tfvars"
         if: failure() && steps.provision_servers.outcome == 'failure'
 
       - name: Configure cluster
@@ -174,7 +173,7 @@ jobs:
           . venv/bin/activate
           . environments/.stackhpc/activate
           cd $APPLIANCES_ENVIRONMENT_ROOT/terraform
-          terraform destroy -auto-approve
+          terraform destroy -auto-approve -var-file="${{ vars.CI_CLOUD }}.tfvars"
         if: ${{ success() || cancelled() }}
 
       # - name: Delete images

environments/.stackhpc/terraform/ARCUS.tfvars

@@ -0,0 +1,5 @@
+cluster_net = "stackhpc-ci-geneve"
+cluster_subnet = "stackhpc-ci-geneve-subnet"
+vnic_type = "normal"
+control_node_flavor = "vm.ska.cpu.general.quarter"
+other_node_flavor = "vm.ska.cpu.general.small"

environments/.stackhpc/terraform/SMS.tfvars

@@ -0,0 +1,5 @@
+cluster_net = "WCDC-iLab-60"
+cluster_subnet = "WCDC-iLab-60"
+vnic_type = "direct"
+control_node_flavor = "general.v1.medium"
+other_node_flavor = "general.v1.tiny"

environments/.stackhpc/terraform/main.tf

@@ -1,3 +1,5 @@
+# This terraform configuration uses the "skeleton" terraform, so that is checked by CI.
+
 variable "environment_root" {
     type = string
     description = "Path to environment root, automatically set by activate script"
@@ -22,31 +24,41 @@ variable "cluster_image" {
     # default = "Rocky-8-GenericCloud-8.6.20220702.0.x86_64.qcow2"
 }
 
+variable "cluster_net" {}
+
+variable "cluster_subnet" {}
+
+variable "vnic_type" {}
+
+variable "control_node_flavor" {}
+
+variable "other_node_flavor" {}
+
 module "cluster" {
     source = "../../skeleton/{{cookiecutter.environment}}/terraform/"
 
     cluster_name = var.cluster_name
-    cluster_net = "WCDC-iLab-60"
-    cluster_subnet = "WCDC-iLab-60"
-    vnic_type = "direct"
+    cluster_net = var.cluster_net
+    cluster_subnet = var.cluster_subnet
+    vnic_type = var.vnic_type
     key_pair = "slurm-app-ci"
     control_node = {
-        flavor: "vm.ska.cpu.general.quarter"
+        flavor: var.control_node_flavor
         image: var.cluster_image
     }
     login_nodes = {
         login-0: {
-            flavor: "vm.ska.cpu.general.small"
+            flavor: var.other_node_flavor
             image: var.cluster_image
         }
     }
     compute_types = {
         small: {
-            flavor: "vm.ska.cpu.general.small"
+            flavor: var.other_node_flavor
             image: var.cluster_image
         }
         extra: {
-            flavor: "vm.ska.cpu.general.small"
+            flavor: var.other_node_flavor
             image: var.cluster_image
         }
     }