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 -%}