summaryrefslogtreecommitdiffstats
path: root/roles/openshift_common
diff options
context:
space:
mode:
Diffstat (limited to 'roles/openshift_common')
-rw-r--r--roles/openshift_common/defaults/main.yml5
-rw-r--r--roles/openshift_common/tasks/main.yml1
2 files changed, 6 insertions, 0 deletions
diff --git a/roles/openshift_common/defaults/main.yml b/roles/openshift_common/defaults/main.yml
index 20b6f082c..a541591fb 100644
--- a/roles/openshift_common/defaults/main.yml
+++ b/roles/openshift_common/defaults/main.yml
@@ -1,3 +1,8 @@
---
openshift_bind_ip: "{{ ansible_default_ipv4.address }}"
openshift_debug_level: 0
+
+# TODO: Once openshift stops resolving hostnames for node queries remove
+# this...
+openshift_hostname_workaround: true
+openshift_hostname: "{{ openshift_public_ip if openshift_hostname_workaround else ansible_fqdn }}"
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml
index cfa0d8dfe..f72beb65b 100644
--- a/roles/openshift_common/tasks/main.yml
+++ b/roles/openshift_common/tasks/main.yml
@@ -2,6 +2,7 @@
# fixme: Once openshift stops resolving hostnames for node queries remove this...
- name: Set hostname to IP Addr (WORKAROUND)
hostname: name={{ openshift_bind_ip }}
+ when: openshift_hostname_workaround
- name: Configure local facts file
file: path=/etc/ansible/facts.d/ state=directory mode=0750