Merge pull request #237 from stackhpc/feat/remove-cloud-init

Remove cloud_init role

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/bootstrap.yml

@@ -18,13 +18,8 @@
   tags: etc_hosts
   become: yes
   tasks:
-    - name: Template /etc/hosts
-      copy:
-        content: "{{ etc_hosts_template }}"
-        dest: /etc/hosts
-        owner: root
-        group: root
-        mode: u=rw,og=r
+    - import_role:
+        name: etc_hosts
 
 - hosts: cluster
   gather_facts: false

ansible/roles/cloud_init/README.md

@@ -1,5 +1,7 @@
 # etc_hosts
 
-This role provides documentation only.
+Hosts in the `etc_hosts` groups have `/etc/hosts` created. The generated file defines all hosts in this group using `ansible_host` as the IP address and `inventory_hostname` as the canonical hostname. This may need overriding for multi-homed hosts. See `environments/common/inventory/group_vars/all/cloud_init.yml` for configuration.
 
-Hosts in the `etc_hosts` groups get `/etc/hosts` created via `cloud-init`. The generated file defines all hosts in this group using `ansible_host` as the IP address and `inventory_hostname` as the canonical hostname. This may need overriding for multi-homed hosts. See `environments/common/inventory/group_vars/all/cloud_init.yml` for configuration.
+# Variables:
+
+- `etc_hosts_template`: Template file to use. Default uses in-role template.

ansible/roles/cloud_init/defaults/main.yml

@@ -0,0 +1 @@
+etc_hosts_template: hosts.j2

ansible/roles/cloud_init/tasks/template.yml

@@ -0,0 +1,8 @@
+- name: Template out /etc/hosts
+  template:
+    src: "{{ etc_hosts_template }}"
+    dest: /etc/hosts
+    owner: root
+    group: root
+    mode: 0644
+  become: yes

ansible/roles/cloud_init/templates/userdata.yml.j2

@@ -0,0 +1,6 @@
+127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
+::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
+
+{% for hostname in groups['etc_hosts'] | sort -%}
+{{ hostvars[hostname]['ansible_host'] }} {{ hostname }}
+{% endfor -%}

ansible/roles/etc_hosts/README.md

@@ -57,4 +57,7 @@ module "cluster" {
     create_nodes = var.create_nodes
 
     environment_root = var.environment_root
+    # Can reduce volume size a lot for short-lived CI clusters:
+    state_volume_size = 10
+    home_volume_size = 20
 }

ansible/roles/etc_hosts/defaults/main.yml

@@ -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: ${var.state_volume_device_path}
+        partition: auto
+      - label: home
+        filesystem: ext4
+        device: ${var.home_volume_device_path}
+        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,
       ]
     }
 

ansible/roles/etc_hosts/tasks/main.yml

@@ -49,6 +49,18 @@ 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"