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_common/defaults/main.yml | 4 ++++ roles/openshift_common/tasks/main.yml | 1 + 2 files changed, 5 insertions(+) (limited to 'roles/openshift_common') diff --git a/roles/openshift_common/defaults/main.yml b/roles/openshift_common/defaults/main.yml index 20b6f082c..cda966c96 100644 --- a/roles/openshift_common/defaults/main.yml +++ b/roles/openshift_common/defaults/main.yml @@ -1,3 +1,7 @@ --- 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 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 -- 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_common/defaults/main.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'roles/openshift_common') 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 }}" -- cgit v1.2.3