Bump fatimage base to RL8.9

.github/workflows/fatimage.yml

@@ -48,6 +48,8 @@ jobs:
           cd packer/
           packer init .
           PACKER_LOG=1 packer build -only openstack.openhpc -on-error=${{ vars.PACKER_ON_ERROR }} -var-file=$PKR_VAR_environment_root/${{ vars.CI_CLOUD }}.pkrvars.hcl openstack.pkr.hcl
+        env:
+          TESTUSER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }}
 
       - name: Get created image name from manifest
         id: manifest

environments/.stackhpc/ARCUS.pkrvars.hcl

@@ -4,7 +4,7 @@ volume_size = 10 # GB
 image_disk_format = "qcow2"
 networks = ["4b6b2722-ee5b-40ec-8e52-a6610e14cc51"] # portal-internal (DNS broken on ilab-60)
 source_image_name = "openhpc-230804-1754-80b8d714" # https://github.com/stackhpc/ansible-slurm-appliance/pull/298
-fatimage_source_image_name = "Rocky-8-GenericCloud-Base-8.8-20230518.0.x86_64.qcow2"
+fatimage_source_image_name = "Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2"
 ssh_keypair_name = "slurm-app-ci"
 ssh_private_key_file = "~/.ssh/id_rsa"
 security_groups = ["default", "SSH"]

environments/.stackhpc/SMS.pkrvars.hcl

@@ -1,7 +1,7 @@
 flavor = "general.v1.tiny"
 networks = ["26023e3d-bc8e-459c-8def-dbd47ab01756"] # stackhpc-ipv4-geneve
 source_image_name = "openhpc-230503-0944-bf8c3f63" # https://github.com/stackhpc/ansible-slurm-appliance/pull/252
-fatimage_source_image_name = "Rocky-8-GenericCloud-Base-8.8-20230518.0.x86_64.qcow2"
+fatimage_source_image_name = "Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2"
 ssh_keypair_name = "slurm-app-ci"
 ssh_private_key_file = "~/.ssh/id_rsa"
 security_groups = ["default", "SSH"]

environments/.stackhpc/terraform/ARCUS.tfvars

@@ -3,5 +3,3 @@ cluster_subnet = "portal-internal"
 vnic_type = "normal"
 control_node_flavor = "vm.ska.cpu.general.quarter"
 other_node_flavor = "vm.ska.cpu.general.small"
-state_volume_device_path = "/dev/sdb"
-home_volume_device_path = "/dev/sdc"

environments/.stackhpc/terraform/SMS.tfvars

@@ -3,5 +3,3 @@ cluster_subnet = "stackhpc-ipv4-geneve-subnet"
 vnic_type = "normal"
 control_node_flavor = "general.v1.medium"
 other_node_flavor = "general.v1.tiny"
-state_volume_device_path = "/dev/vdb"
-home_volume_device_path = "/dev/vdc"

environments/.stackhpc/terraform/main.tf

@@ -31,10 +31,6 @@ variable "volume_backed_instances" {
     default = false
 }
 
-variable "state_volume_device_path" {}
-
-variable "home_volume_device_path" {}
-
 module "cluster" {
     source = "../../skeleton/{{cookiecutter.environment}}/terraform/"
 
@@ -76,6 +72,4 @@ module "cluster" {
     state_volume_size = 10
     home_volume_size = 20
 
-    state_volume_device_path = var.state_volume_device_path
-    home_volume_device_path = var.home_volume_device_path
 }

environments/skeleton/{{cookiecutter.environment}}/terraform/nodes.tf

@@ -125,19 +125,12 @@ resource "openstack_compute_instance_v2" "control" {
   user_data = <<-EOF
     #cloud-config
     fqdn: ${var.cluster_name}-${each.key}.${var.cluster_name}.${var.cluster_domain_suffix}
-
-    fs_setup:
-      - label: state
-        filesystem: ext4
-        device: ${var.state_volume_device_path}
-        partition: auto
-      - label: home
-        filesystem: ext4
-        device: ${var.home_volume_device_path}
-        partition: auto
-
+    bootcmd:
+      %{for volume in [openstack_blockstorage_volume_v3.state, openstack_blockstorage_volume_v3.home]}
+      - mke2fs -t ext4 -L ${lower(split(" ", volume.description)[0])} $(readlink -f $(ls /dev/disk/by-id/*${substr(volume.id, 0, 20)}* | head -n1 ))
+      %{endfor}
     mounts:
-      - [LABEL=state, ${var.state_dir}]
+      - [LABEL=state, ${var.state_dir}, auto, "x-systemd.after=cloudinit.service"]
       - [LABEL=home, /exports/home, auto, "x-systemd.required-by=nfs-server.service,x-systemd.before=nfs-server.service"]
   EOF
 

environments/skeleton/{{cookiecutter.environment}}/terraform/variables.tf

@@ -55,18 +55,6 @@ variable "environment_root" {
     description = "Path to environment root, automatically set by activate script"
 }
 
-variable "state_volume_device_path" {
-    type = string
-    description = "Path to block device for state"
-    default = "/dev/sdb"
-}
-
-variable "home_volume_device_path" {
-    type = string
-    description = "Path to block device name for home directories"
-    default = "/dev/sdc"
-}
-
 variable "state_dir" {
     type = string
     description = "Path to state directory on control node"

requirements.yml

@@ -1,7 +1,8 @@
 ---
 roles:
-  - src: stackhpc.nfs
-    version: v22.9.1
+  - src: https://github.com/stackhpc/ansible-role-cluster-nfs.git
+    version: fix/stale-nfs # TODO: release
+    name: stackhpc.nfs
   - src: https://github.com/stackhpc/ansible-role-openhpc.git
     version: v0.23.0 # https://github.com/stackhpc/ansible-role-openhpc/pull/165
     name: stackhpc.openhpc