add volumes for control node persistent state

Author: sjpb

group_vars/control.yml

@@ -0,0 +1,2 @@
+# Define path for persistent state on control node volume:
+appliances_state_dir: /var/lib/state

group_vars/openstack.yml

@@ -16,3 +16,5 @@ terraform_project_path: "{{ playbook_dir }}/terraform"
 
 terraform_state: "{{ cluster_state | default('present') }}"
 cluster_ssh_user: rocky
+
+state_volume_size: 150 # GB

roles/cluster_infra/templates/resources.tf.j2

@@ -69,6 +69,22 @@ resource "openstack_networking_secgroup_rule_v2" "secgroup_slurm_login_rule_ingr
   security_group_id = "${openstack_networking_secgroup_v2.secgroup_slurm_login.id}"
 }
 
+#####
+##### Volumes
+#####
+resource "openstack_blockstorage_volume_v3" "state" {
+    name = "{{ cluster_name }}-state"
+    description = "State for control node"
+    size = "{{ state_volume_size }}"
+}
+
+resource "openstack_blockstorage_volume_v3" "home" {
+    name = "{{ cluster_name }}-home"
+    description = "Home for control node"
+    size = "{{ home_volme_size }}"
+}
+
+
 #####
 ##### Cluster nodes
 #####
@@ -111,12 +127,50 @@ resource "openstack_compute_instance_v2" "control" {
     name = "{{ cluster_network }}"
   }
   security_groups = ["${openstack_networking_secgroup_v2.secgroup_slurm_cluster.name}"]
-  # Use cloud-init to inject the SSH keys
+
+  # root device:
+  block_device {
+      uuid = "{{ cluster_image }}"
+      source_type  = "image"
+      destination_type = "local"
+      boot_index = 0
+      delete_on_termination = true
+  }
+
+  # state volume:
+  block_device {
+      destination_type = "volume"
+      source_type  = "volume"
+      boot_index = -1
+      uuid = openstack_blockstorage_volume_v3.state.id
+  }
+
+  # home volume:
+  block_device {
+      destination_type = "volume"
+      source_type  = "volume"
+      boot_index = -1
+      uuid = openstack_blockstorage_volume_v3.home.id
+  }
+
+  # Use cloud-init to a) inject SSH keys b) configure volumes
   user_data = <<-EOF
     #cloud-config
     ssh_authorized_keys:
       - {{ cluster_deploy_ssh_public_key }}
       - {{ cluster_user_ssh_public_key }}
+    fs_setup:
+      - label: state
+        filesystem: ext4
+        device: /dev/vdb
+        partition: auto
+      - label: home
+        filesystem: ext4
+        device: /dev/vdc
+        partition: auto
+    mounts:
+        - [LABEL=state, /var/lib/state]
+        - [LABEL=home, /exports/home, auto, "x-systemd.required-by=nfs-server.service,x-systemd.before=nfs-server.service"]
   EOF
 }
 

ui-meta/slurm-infra.yml

@@ -28,6 +28,15 @@ parameters:
     options:
       min_ram: 2048
       min_disk: 10
+  
+  - name: home_volme_size
+    label: Home volume size
+    description: The size in GB of the volume to use for home directories
+    kind: integer
+    immutable: true
+    options:
+      min: 1
+    default: 100
 
   - name: cluster_run_validation
     label: Post-configuration validation