From: Zack Cerza <zack@redhat.com>
Date: Tue, 2 Jun 2015 16:51:03 +0000 (-0600)
Subject: Also correct hostnames on RHEL6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F45%2Fhead;p=ceph-cm-ansible.git

Also correct hostnames on RHEL6

Fix them if they are 'localhost' as well.

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/roles/testnode/tasks/redhat/rhel_7.yml b/roles/testnode/tasks/redhat/rhel_7.yml
index df7e752c..3572fc09 100644
--- a/roles/testnode/tasks/redhat/rhel_7.yml
+++ b/roles/testnode/tasks/redhat/rhel_7.yml
@@ -8,24 +8,6 @@
     name: firewalld
     state: stopped
 
-
-- name: Get hostname.
-  command: hostname
-  register: existing_hostname
-  changed_when: false
-
-- name: Remove lab domain from hostname.
-  shell: hostname | cut -d'.' -f1
-  register: new_hostname
-  when: existing_hostname is defined and
-        existing_hostname.stdout.find("{{ lab_domain | mandatory }}") != -1
-
-- name: Set hostname.
-  hostname:
-     name: "{{ new_hostname.stdout }}"
-  when: existing_hostname is defined and
-        existing_hostname.stdout.find("{{ lab_domain | mandatory }}") != -1
-
 # Install and configure cpan and Amazon::S3
 - include: ../cpan.yml
   tags:
diff --git a/roles/testnode/tasks/redhat/set_hostname.yml b/roles/testnode/tasks/redhat/set_hostname.yml
new file mode 100644
index 00000000..d49bbdaa
--- /dev/null
+++ b/roles/testnode/tasks/redhat/set_hostname.yml
@@ -0,0 +1,23 @@
+---
+- name: Get hostname.
+  command: hostname
+  register: existing_hostname
+  changed_when: false
+
+- name: Correct hostname if it is 'localhost'
+  set_fact:
+    new_hostname: "{{ inventory_hostname.split('.')[0] }}"
+  when: existing_hostname is defined and
+        existing_hostname.stdout.find("localhost") != -1
+
+- name: Remove lab domain from hostname.
+  set_fact:
+    new_hostname: "{{ existing_hostname.stdout.split('.')[0] }}"
+  when: existing_hostname is defined and
+        existing_hostname.stdout.find("{{ lab_domain | mandatory }}") != -1
+
+- name: Set hostname.
+  hostname:
+     name: "{{ new_hostname }}"
+  when: existing_hostname is defined and
+        existing_hostname.stdout != new_hostname
diff --git a/roles/testnode/tasks/setup-redhat.yml b/roles/testnode/tasks/setup-redhat.yml
index cf078935..2018a7c3 100644
--- a/roles/testnode/tasks/setup-redhat.yml
+++ b/roles/testnode/tasks/setup-redhat.yml
@@ -1,4 +1,8 @@
 ---
+- name: Set the hostname
+  include: redhat/set_hostname.yml
+  tags:
+    - hostname
 
 - name: Include rhel 7.x specific tasks.
   include: redhat/rhel_7.yml