move /etc/hosts templating from cloud_init to bootstrap.yml

Author: sjpb

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/etc_hosts/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/etc_hosts/defaults/main.yml

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

ansible/roles/etc_hosts/tasks/main.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/etc_hosts/templates/hosts.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 -%}

environments/common/inventory/group_vars/all/cloud_init.yml

@@ -1,27 +1,6 @@
 cloud_init_output_path: "{{ lookup('env', 'APPLIANCES_ENVIRONMENT_ROOT') }}/cloud_init"
 
-etc_hosts_template: |
-  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 -%}
-
-cloud_init_userdata_etchosts:
-  module: write_files
-  group: etc_hosts
-  template: |-
-    # etc_hosts group:
-      - path: /etc/hosts
-        encoding: text/plain
-        permissions: "0644"
-        owner: root:root
-        content: |
-          {{ etc_hosts_template | indent(width=6, first=false) }}
-
-cloud_init_userdata_templates_default: # provides indirection so environments could copy parts of default without having to rewrite the entire thing
-  - "{{ cloud_init_userdata_etchosts }}"
+cloud_init_userdata_templates_default: [] # provides indirection so environments could copy parts of default without having to rewrite the entire thing
 
 cloud_init_userdata_templates_extra: []
 cloud_init_userdata_templates: "{{ cloud_init_userdata_templates_default + cloud_init_userdata_templates_extra }}"