From ba6b4e8c24c9ef21eeed43c554b9b23a33946e87 Mon Sep 17 00:00:00 2001
From: Russell Teague <rteague@redhat.com>
Date: Tue, 15 Aug 2017 08:25:31 -0400
Subject: Cleanup validate_hostnames

---
 playbooks/common/openshift-cluster/validate_hostnames.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'playbooks/common')

diff --git a/playbooks/common/openshift-cluster/validate_hostnames.yml b/playbooks/common/openshift-cluster/validate_hostnames.yml
index 33fc5630f..be2e6a15a 100644
--- a/playbooks/common/openshift-cluster/validate_hostnames.yml
+++ b/playbooks/common/openshift-cluster/validate_hostnames.yml
@@ -1,17 +1,22 @@
 ---
-- name: Gather and set facts for node hosts
+- name: Validate node hostnames
   hosts: oo_nodes_to_config
-  roles:
-  - openshift_facts
   tasks:
-  - shell:
+  - name: Query DNS for IP address of {{ openshift.common.hostname }}
+    shell:
       getent ahostsv4 {{ openshift.common.hostname }} | head -n 1 | awk '{ print $1 }'
     register: lookupip
     changed_when: false
     failed_when: false
   - name: Warn user about bad openshift_hostname values
     pause:
-      prompt: "The hostname \"{{ openshift.common.hostname }}\" for \"{{ ansible_nodename }}\" doesn't resolve to an ip address owned by this host. Please set openshift_hostname variable to a hostname that when resolved on the host in question resolves to an IP address matching an interface on this host. This host will fail liveness checks for pods utilizing hostPorts, press ENTER to continue or CTRL-C to abort."
+      prompt:
+        The hostname {{ openshift.common.hostname }} for {{ ansible_nodename }}
+        doesn't resolve to an IP address owned by this host. Please set
+        openshift_hostname variable to a hostname that when resolved on the host
+        in question resolves to an IP address matching an interface on this
+        host. This host will fail liveness checks for pods utilizing hostPorts,
+        press ENTER to continue or CTRL-C to abort.
       seconds: "{{ 10 if openshift_override_hostname_check | default(false) | bool else omit }}"
     when:
     - lookupip.stdout != '127.0.0.1'
-- 
cgit v1.2.3