summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-03-01 00:43:07 -0500
committerJason DeTiberus <jdetiber@redhat.com>2015-03-02 11:02:00 -0500
commit8fea5fec61fabac1a72e8cc2a0874501ed4458ac (patch)
treebeab4adc980f72a882a192ed271e3de20eb027ed /roles/openshift_master
parente55ef121003649cfe72bb51c6d51a492898f328a (diff)
downloadopenshift-8fea5fec61fabac1a72e8cc2a0874501ed4458ac.tar.gz
openshift-8fea5fec61fabac1a72e8cc2a0874501ed4458ac.tar.bz2
openshift-8fea5fec61fabac1a72e8cc2a0874501ed4458ac.tar.xz
openshift-8fea5fec61fabac1a72e8cc2a0874501ed4458ac.zip
add openshift_hostname workaround var
- use openshift_bind_ip for hostname when openshift_hostname_workaround is true - defaults to true to maintain current behavior.
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/tasks/main.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 0b3842856..1acc5b99b 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -16,8 +16,9 @@
lineinfile:
dest: /etc/sysconfig/openshift-master
regexp: '^OPTIONS='
- line: "OPTIONS=\"--public-master={{ openshift_public_ip }} --nodes={{ openshift_node_ips
- | join(',') }} --loglevel={{ openshift_master_debug_level }}\""
+ line: "OPTIONS=\"--public-master={{ openshift_public_ip if
+ openshift_hostname_workaround else ansible_fqdn }} --nodes={{ openshift_node_ips
+ | join(',') }} --loglevel={{ openshift_master_debug_level }}\""
notify:
- restart openshift-master