From: Zack Cerza <zack@redhat.com>
Date: Tue, 3 Nov 2015 21:15:17 +0000 (-0700)
Subject: testnodes: Set hostnames properly
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c5189b10f8380e7555f8dbfa7a212bc1f3d2a8ea;p=ceph-cm-ansible.git

testnodes: Set hostnames properly

Instead of using convoluted logic to determine whether or not to set the
hostname, just do it. The hostname module is nice and idempotent.

This was inspired by http://tracker.ceph.com/issues/13679

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

diff --git a/roles/testnode/tasks/set_hostname.yml b/roles/testnode/tasks/set_hostname.yml
index 3424f67..8c51e56 100644
--- a/roles/testnode/tasks/set_hostname.yml
+++ b/roles/testnode/tasks/set_hostname.yml
@@ -1,23 +1,8 @@
 ---
-- 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.
+- name: Set hostname var
   set_fact:
-    new_hostname: "{{ existing_hostname.stdout.split('.')[0] }}"
-  when: existing_hostname is defined and
-        existing_hostname.stdout.find("{{ lab_domain }}") != -1
+    hostname: "{{ inventory_hostname.split('.')[0] }}"
 
-- name: Set hostname.
+- name: "Set the system's hostname"
   hostname:
-     name: "{{ new_hostname }}"
-  when: existing_hostname is defined and
-        existing_hostname.stdout != new_hostname
+     name: "{{ hostname }}"