Merge pull request #50 from linux-kdevops/ci-testing/cel/aws-extra-volumes

Enable AWS to use fixed block device pathnames

Author: chucklever

playbooks/extra_volumes.yml

@@ -0,0 +1,6 @@
+---
+- name: Set up udev rules for /dev/disk/kdevops/
+  gather_facts: false
+  hosts: baseline:dev:service
+  roles:
+    - role: extra_volumes

playbooks/roles/extra_volumes/tasks/main.yml

@@ -0,0 +1,6 @@
+---
+- name: Include provider-specific tasks
+  ansible.builtin.include_tasks:
+    file: "{{ role_path }}/tasks/providers/{{ kdevops_terraform_provider }}.yml"
+  when:
+    - kdevops_terraform_provider == "aws"

playbooks/roles/extra_volumes/tasks/providers/aws.yml

@@ -0,0 +1,48 @@
+---
+- name: Install tmpfiles.d configuration for /dev/disk/kdevops/
+  become: true
+  ansible.builtin.template:
+    src: "kdevops-disk.conf.j2"
+    dest: "/etc/tmpfiles.d/kdevops-disk.conf"
+    owner: "root"
+    group: "root"
+    mode: "u=rw,g=r,o=r"
+
+- name: Create /dev/disk/kdevops/ directory using tmpfiles
+  become: true
+  ansible.builtin.command: "systemd-tmpfiles --create /etc/tmpfiles.d/kdevops-disk.conf"
+  changed_when: true
+
+- name: Extract the "extra volumes" map
+  delegate_to: localhost
+  run_once: true
+  cloud.terraform.terraform_output:
+    format: json
+    name: "extra_volumes_map"
+    project_path: "{{ topdir_path }}/terraform/aws"
+  register: terraform_output
+
+- name: Install the script that creates symlinks in /dev/disk/kdevops
+  become: true
+  vars:
+    volume_mapping: "{{ terraform_output.value[inventory_hostname] }}"
+  ansible.builtin.template:
+    src: "udev-ebs-tagger.j2"
+    dest: "/usr/local/bin/udev-ebs-tagger"
+    owner: "root"
+    group: "root"
+    mode: "u=rwx,g=rx,o=rx"
+
+- name: Create the "extra volumes" udev rule
+  become: true
+  ansible.builtin.template:
+    src: 99-aws-ebs.rules.j2
+    dest: "/etc/udev/rules.d/99-aws-ebs.rules"
+    owner: "root"
+    group: "root"
+    mode: "u=rw,g=r,o=r"
+
+- name: Force the target node to reload its udev ruleset and trigger block devices
+  become: true
+  ansible.builtin.shell: "udevadm control --reload && udevadm trigger --subsystem-match=block --action=add"
+  changed_when: true

playbooks/roles/extra_volumes/tasks/providers/azure.yml

@@ -0,0 +1 @@
+---

playbooks/roles/extra_volumes/tasks/providers/gce.yml

@@ -0,0 +1 @@
+---

playbooks/roles/extra_volumes/tasks/providers/oci.yml

@@ -0,0 +1 @@
+---

playbooks/roles/extra_volumes/templates/99-aws-ebs.rules.j2

@@ -0,0 +1 @@
+ACTION=="add|change", KERNEL=="nvme[0-9]*n[0-9]*", SUBSYSTEM=="block", PROGRAM="/usr/local/bin/udev-ebs-tagger %k", SYMLINK+="%c"

playbooks/roles/extra_volumes/templates/kdevops-disk.conf.j2

@@ -0,0 +1,3 @@
+# kdevops extra volumes directory
+# This directory must exist before udev creates symlinks to extra volumes
+d /dev/disk/kdevops 0755 root root - -

playbooks/roles/extra_volumes/templates/udev-ebs-tagger.j2

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+DEVICE="$1"
+
+# Ensure the target directory exists
+mkdir -p /dev/disk/kdevops
+
+# Get volume ID from device serial
+VOLUME_ID=$(/usr/bin/lsblk -no SERIAL "/dev/$DEVICE" 2>/dev/null | head -1)
+if [[ -z "$VOLUME_ID" || "$VOLUME_ID" == "null" ]]; then
+    exit 0
+fi
+
+# Static mapping from Terraform outputs
+case "$VOLUME_ID" in
+{% for tags, volume_id in volume_mapping.items() %}
+    "{{ volume_id.replace("-", "") }}")
+        SYMLINKS="disk/kdevops/{{ tags }} "
+        echo "$SYMLINKS" | sed 's/[[:space:]]*$//'
+        ;;
+{% endfor %}
+    *)
+        # Unknown volume
+        exit 0
+        ;;
+esac

playbooks/roles/volume_group/tasks/terraform/aws.yml

@@ -28,14 +28,14 @@
   register: terraform_output
   changed_when: false
 
-# FIXME: Stuff "/dev/sdf" into the data_device variable for AWS
 - name: Exclude the device that will house the /data file system
   vars:
     block_device_dict: "{{ terraform_output.stdout | from_json }}"
     local_map: "{{ block_device_dict[inventory_hostname] }}"
   ansible.builtin.set_fact:
     ebs_volume_ids: "{{ ebs_volume_ids + ['nvme-Amazon_Elastic_Block_Store_' + item.value | regex_replace('-', '')] }}"
-  when: item.key != "/dev/sdf"
+  when:
+    item.key != data_device
   with_dict: "{{ local_map }}"
 
 - name: Add unused EBS volumes to the volume list