Merge branch 'hostname' into 'master'

switch variables from ansible_hostname to inventory_hostname incase ansible is a…

…lso configuring the hostname based on the inventory

See merge request !36

roles/calculateEtcHosts/files/makehosts.py

@@ -17,6 +17,7 @@ for group in d['groups'].keys():
     i=0
     for h in d['groups'][group]:
       name = d['hostvars'][h]['ansible_hostname']
+      name = h
       if not domain:
         hosts[h] = [name]
       else:

roles/etcHosts/tasks/main.yml

@@ -3,7 +3,7 @@
   sudo: true
 
 - name: set hostname by sysctl
-  shell: sysctl kernel.hostname="{{ ansible_hostname }}"
+  shell: sysctl kernel.hostname="{{ inventory_hostname }}"
   sudo: true
 
 - name: set domainname by sysctl
@@ -11,7 +11,7 @@
   sudo: true
 
 - name: set /etc/sysconfig/network on CentOS 6
-  lineinfile: dest=/etc/sysconfig/network line='HOSTNAME={{ ansible_hostname }}' regexp='^HOSTNAME'
+  lineinfile: dest=/etc/sysconfig/network line='HOSTNAME={{ inventory_hostname }}' regexp='^HOSTNAME'
   sudo: true
   when: ansible_distribution == "CentOS"
 
@@ -29,4 +29,3 @@
   template: src=hostname dest=/etc/hostname
   become: true
   become_user: root
-  when: ansible_distribution == "CentOS"

roles/etcHosts/templates/hostname

-{{ ansible_hostname }}
+{{ inventory_hostname }}

roles/make_filesystems/tasks/main.yml

 ---
 - name: format volumes
-  filesystem: fstype={{ item.fstype }} dev={{ hostvars[ansible_hostname]['ansible_host_volumes'][item.name]['dev'] }}
+  filesystem: fstype={{ item.fstype }} dev={{ hostvars[inventory_hostname]['ansible_host_volumes'][item.name]['dev'] }}
   with_items: volumes
   sudo: true
 
 - name: format volumes
-  mount: name={{ item.mntpt }} fstype={{ item.fstype }} src={{ hostvars[ansible_hostname]['ansible_host_volumes'][item.name]['dev'] }} state=mounted
+  mount: name={{ item.mntpt }} fstype={{ item.fstype }} src={{ hostvars[inventory_hostname]['ansible_host_volumes'][item.name]['dev'] }} state=mounted
   with_items: volumes
   sudo: true