From 8fea5fec61fabac1a72e8cc2a0874501ed4458ac Mon Sep 17 00:00:00 2001 From: Jason DeTiberus 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/tasks') 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 From b8e4abd2f23409432f65c4bd4a48e3732adeea47 Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Mon, 2 Mar 2015 11:00:29 -0500 Subject: Add openshift_hostname default variable to openshift_common - for use anywhere the hostname is used that would be dependent on the openshift_hostname_workaround setting. --- roles/openshift_master/tasks/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'roles/openshift_master/tasks') 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 -- cgit v1.2.3