From: dgalloway <dgallowa@REDHAT.COM>
Date: Wed, 30 Sep 2015 19:11:26 +0000 (-0400)
Subject: testnode: set_hostname should be a global task
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ae09ced8721f635138dad6c27be7b9a53deda5f0;p=ceph-cm-ansible.git

testnode: set_hostname should be a global task

Signed-off-by: dgalloway <dgallowa@REDHAT.COM>
---

diff --git a/roles/testnode/tasks/main.yml b/roles/testnode/tasks/main.yml
index 6e484a8..bc1c877 100644
--- a/roles/testnode/tasks/main.yml
+++ b/roles/testnode/tasks/main.yml
@@ -17,6 +17,12 @@
     group: root
     mode: 0755
 
+- name: Set the hostname
+  include: set_hostname.yml
+  when: lab_domain != ""
+  tags:
+    - hostname
+
 # upload custom disk monitoring scripts
 - include: disk_monitoring.yml
   tags:
diff --git a/roles/testnode/tasks/redhat/set_hostname.yml b/roles/testnode/tasks/redhat/set_hostname.yml
deleted file mode 100644
index 3424f67..0000000
--- a/roles/testnode/tasks/redhat/set_hostname.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- 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 }}") != -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/set_hostname.yml b/roles/testnode/tasks/set_hostname.yml
new file mode 100644
index 0000000..3424f67
--- /dev/null
+++ b/roles/testnode/tasks/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 }}") != -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 073d8a1..667e4cd 100644
--- a/roles/testnode/tasks/setup-redhat.yml
+++ b/roles/testnode/tasks/setup-redhat.yml
@@ -1,10 +1,4 @@
 ---
-- name: Set the hostname
-  include: redhat/set_hostname.yml
-  when: lab_domain != ""
-  tags:
-    - hostname
-
 - name: Include rhel 7.x specific tasks.
   include: redhat/rhel_7.yml
   when: ansible_distribution_major_version == "7"