Get inithost to work with Ansible 1.9.x

defaults/main.yml

 commonauth_extras: []
-auth_certs: []
+auth_keys: []
+static_ipv4: '192.168.1.1'
+distribute_keys: false

tasks/commonauth.yml

@@ -30,11 +30,11 @@
     mode=644
   with_items: admins
 
-- include: distribute_certs.yml
-  when: distribute_certs
+- include: distribute_keys.yml
+  when: distribute_keys
 
 - name: "User | Install Public Key For Extra Users"
   authorized_key:
     user={{ item.username }}
-    key="{{ lookup('file', inventory_dir + '/files/keys/' + item.certname + '.d2s.pub') }}"
-  with_items: auth_certs
+    key="{{ lookup('file', inventory_dir + '/files/keys/' + item.keyname + '.d2s.pub') }}"
+  with_items: auth_keys

tasks/distribute_certs.yml → tasks/distribute_keys.yml

-# ================= Rebuild cert auth for all admins ===========================
+# ================= Rebuild keys auth for all admins ===========================
 
 ---
-# file: roles/commonauth/tasks/distribute_certs.yml
+# file: roles/commonauth/tasks/distribute_keys.yml
 
-- name: "Certs | Remove the fresh auth file in case it does already exist"
+- name: "Keys | Remove the fresh auth file in case it does already exist"
   file:
     path=/home/{{ item }}/.ssh/auth_keys_fresh
     state=absent
   with_items: admins
 
-- name: "Certs | Install Public Keys For Desktop-To-Server Communication in a fresh file"
+- name: "Keys | Install Public Keys For Desktop-To-Server Communication in a fresh file"
   authorized_key:
     user={{ item }}
-    key={{ lookup('file', inventory_dir + '/files/keys/' + item + '.d2s.pub') }}
+    key="{{ lookup('file', inventory_dir + '/files/keys/' + item + '.d2s.pub') }}"
     path=/home/{{ item }}/.ssh/fresh_auth_keys_{{ item }}
   with_items: admins
 
-- name: "Certs | Read public key of tunnel user"
+- name: "Keys | Read public key of tunnel user"
   command: more /home/{{ tunnel_user_name }}/.ssh/id_rsa.pub
   register: pubkey
 
-- name: "Certs | Distribute public key of tunnel user"
+- name: "Keys | Distribute public key of tunnel user"
   authorized_key:
     user={{ tunnel_user_name }}
-    key={{ pubkey.stdout }} {{ inventory_hostname }}
+    key="{{ pubkey.stdout }} {{ inventory_hostname }}"
     path=/home/{{ tunnel_user_name }}/.ssh/fresh_auth_keys_tunnel_{{ inventory_hostname }}
   delegate_to: '{{ item }}'
   with_items: groups.all
 
-- name: "Certs | Merge all public keys"
+- name: "Keys | Merge all public keys"
   shell: cat /home/{{ item }}/.ssh/fresh_auth_keys* > /home/{{ item }}/.ssh/auth_keys_fresh
   with_items: admins
 
-- name: "Certs | Remove temp files"
+- name: "Keys | Remove temp files"
   shell: rm /home/{{ item }}/.ssh/fresh_auth_keys_*
   with_items: admins
 
-- name: "Certs | Set ownership of authorized key file"
+- name: "Keys | Set ownership of authorized key file"
   shell: chown {{ item }}:root /home/{{ item }}/.ssh/auth_keys_fresh
   with_items: admins
 
-- name: "Certs | Set permission for authorized key file"
+- name: "Keys | Set permission for authorized key file"
   shell: chmod 600 /home/{{ item }}/.ssh/auth_keys_fresh
   with_items: admins
 
-- name: "Certs | Make sure the authorized_keys file exists"
+- name: "Keys | Make sure the authorized_keys file exists"
   file:
     name=/home/{{ item }}/.ssh/authorized_keys
     state=touch
   with_items: admins
 
-- name: "Certs | Move the fresh auth file to replace the old one"
+- name: "Keys | Move the fresh auth file to replace the old one"
   shell: rm /home/{{ item }}/.ssh/authorized_keys && mv /home/{{ item }}/.ssh/auth_keys_fresh /home/{{ item }}/.ssh/authorized_keys
   with_items: admins

templates/etc_hosts

@@ -25,11 +25,7 @@ ff02::2	  ip6-allrouters
 {% endfor %}
 {% endif %}
 {% endif %}
-{% if hostvars[host]['static_ipv4'] is defined %}
-{{hostvars[host]['static_ipv4']}} {{host}}
-{% elif hostvars[host]['ansible_default_ipv4'] is defined %}
-{{hostvars[host]['ansible_default_ipv4']['address']}} {{host}}
-{% endif %}
+{{hostvars[host]['ansible_default_ipv4']['address']|default(hostvars[host]['static_ipv4'])}} {{host}}
 {% endif %}
 {% endfor %}