create cloudinit userdata directly in terraform

Author: sjpb

.github/workflows/stackhpc.yml

@@ -53,21 +53,13 @@ jobs:
         shell: bash
         env:
           arcus_CLOUDS_YAML: ${{ secrets.ARCUS_CLOUDS_YAML }}
-      
-      - name: Provision ports, inventory and other infrastructure apart from nodes
-        run: |
-          . venv/bin/activate
-          . environments/${{ matrix.cloud }}/activate
-          cd $APPLIANCES_ENVIRONMENT_ROOT/terraform
-          TF_VAR_create_nodes=false terraform apply -auto-approve
-      
+            
       - name: Setup environment-specific inventory/terraform inputs
         run: |
           . venv/bin/activate
           . environments/${{ matrix.cloud }}/activate
           ansible-playbook ansible/adhoc/generate-passwords.yml
           echo vault_testuser_password: "$TESTUSER_PASSWORD" > $APPLIANCES_ENVIRONMENT_ROOT/inventory/group_vars/all/test_user.yml
-          ansible-playbook ansible/adhoc/template-cloud-init.yml
         env:
           TESTUSER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }}
 

ansible/roles/cloud_init/README.md

@@ -109,12 +109,26 @@ resource "openstack_compute_instance_v2" "control" {
     environment_root = var.environment_root
   }
 
-  user_data = fileexists(format(local.user_data_path, "control")) ? file(format(local.user_data_path, "control")) : null
+  user_data = <<-EOF
+    #cloud-config
+    fs_setup:
+      - label: state
+        filesystem: ext4
+        device: /dev/vdb
+        partition: auto
+      - label: home
+        filesystem: ext4
+        device: /dev/vdc
+        partition: auto
+
+    mounts:
+      - [LABEL=state, ${var.state_dir}]
+      - [LABEL=home, /exports/home, auto, "x-systemd.required-by=nfs-server.service,x-systemd.before=nfs-server.service"]
+  EOF
 
   lifecycle{
     ignore_changes = [
       image_name,
-      user_data,
       ]
     }
 
@@ -138,12 +152,9 @@ resource "openstack_compute_instance_v2" "login" {
     environment_root = var.environment_root
   }
 
-  user_data = fileexists(format(local.user_data_path, each.key)) ? file(format(local.user_data_path, each.key)) : null
-
   lifecycle{
     ignore_changes = [
       image_name,
-      user_data,
       ]
     }
 
@@ -167,12 +178,9 @@ resource "openstack_compute_instance_v2" "compute" {
     environment_root = var.environment_root
   }
 
-  user_data = fileexists(format(local.user_data_path, each.key)) ? file(format(local.user_data_path, each.key)) : null
-
   lifecycle{
     ignore_changes = [
       image_name,
-      user_data,
       ]
     }