discover volume path for caas too

Author: sjpb

ansible/roles/cluster_infra/tasks/main.yml

@@ -57,29 +57,6 @@
     - terraform_state == "present"
     - cluster_upgrade_system_packages is not defined or not cluster_upgrade_system_packages
 
-- name: Detect volume device prefix from image metadata
-  block:
-    - name: Get image metadata from OpenStack API
-      openstack.cloud.image_info:
-        image: "{{ cluster_previous_image | default(cluster_image) }}"
-      register: cluster_image_info
-    - name: Check only single image found
-      assert:
-        that: cluster_image_info.images | length == 1
-        fail_msg: "Multiple images found for 'cluster_image' {{ cluster_image }}"
-    - name: Set volume_device_prefix fact
-      set_fact:
-        block_device_prefix: >-
-           {{
-              'sd' if (cluster_image_info.images | first).hw_scsi_model is defined and
-              (cluster_image_info.images | first).hw_scsi_model in scsi_models
-              else 'vd'
-           }}
-  # Only run when block_device_prefix isn't set as an extravar
-  when:
-    - block_device_prefix is not defined
-    - cluster_image is defined
-
 - name: Template Terraform files into project directory
   template:
     src: >-

ansible/roles/cluster_infra/templates/resources.tf.j2

@@ -358,18 +358,13 @@ resource "openstack_compute_instance_v2" "control" {
     {%- for ssh_key in cluster_deploy_ssh_keys_extra %}
       - {{ ssh_key }}
     {%- endfor %}
-    fs_setup:
-      - label: state
-        filesystem: ext4
-        device: /dev/{{ block_device_prefix }}b
-        partition: auto
-      - label: home
-        filesystem: ext4
-        device: /dev/{{ block_device_prefix }}c
-        partition: auto
+    bootcmd:
+    %{for volume in [openstack_blockstorage_volume_v3.state, openstack_blockstorage_volume_v3.home]}
+    - BLKDEV=$(readlink -f $(ls /dev/disk/by-id/*${substr(volume.id, 0, 20)}* | head -n1 )); blkid -o value -s TYPE $BLKDEV ||  mke2fs -t ext4 -L ${lower(split(" ", volume.description)[0])} $BLKDEV
+    %{endfor}
     mounts:
-        - [LABEL=state, /var/lib/state, auto, "x-systemd.required-by=nfs-server.service,x-systemd.before=nfs-server.service"]
-        - [LABEL=home, /exports/home, auto, "x-systemd.required-by=nfs-server.service,x-systemd.before=nfs-server.service"]
+        - [LABEL=state, {{ appliances_state_dir }}, auto]
+        - [LABEL=home, /exports/home, auto]
   EOF
 }