summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--roles/openshift_common/defaults/main.yml1
-rw-r--r--roles/openshift_master/tasks/main.yml3
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_common/defaults/main.yml b/roles/openshift_common/defaults/main.yml
index cda966c96..a541591fb 100644
--- a/roles/openshift_common/defaults/main.yml
+++ b/roles/openshift_common/defaults/main.yml
@@ -5,3 +5,4 @@ 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_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 1acc5b99b..ef915d63b 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -16,8 +16,7 @@
lineinfile:
dest: /etc/sysconfig/openshift-master
regexp: '^OPTIONS='
- line: "OPTIONS=\"--public-master={{ openshift_public_ip if
- openshift_hostname_workaround else ansible_fqdn }} --nodes={{ openshift_node_ips
+ line: "OPTIONS=\"--public-master={{ openshift_hostname }} --nodes={{ openshift_node_ips
| join(',') }} --loglevel={{ openshift_master_debug_level }}\""
notify:
- restart openshift-master