From 8fea5fec61fabac1a72e8cc2a0874501ed4458ac Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Sun, 1 Mar 2015 00:43:07 -0500
Subject: add openshift_hostname workaround var
- use openshift_bind_ip for hostname when openshift_hostname_workaround is true
- defaults to true to maintain current behavior.
---
roles/openshift_master/tasks/main.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'roles/openshift_master')
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
--
cgit v1.2.3