diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-03-02 11:15:59 -0500 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-03-02 11:15:59 -0500 |
| commit | 5551a701e467f1fe205dc170c4b0fc651a285c5a (patch) | |
| tree | 495fd94a77259c2efe36d89ab60f2baa608120c4 | |
| parent | e55ef121003649cfe72bb51c6d51a492898f328a (diff) | |
| parent | b8e4abd2f23409432f65c4bd4a48e3732adeea47 (diff) | |
| download | openshift-5551a701e467f1fe205dc170c4b0fc651a285c5a.tar.gz openshift-5551a701e467f1fe205dc170c4b0fc651a285c5a.tar.bz2 openshift-5551a701e467f1fe205dc170c4b0fc651a285c5a.tar.xz openshift-5551a701e467f1fe205dc170c4b0fc651a285c5a.zip | |
Merge pull request #87 from detiber/hostnameWorkaroundVar
add openshift_hostname workaround var
| -rw-r--r-- | roles/openshift_common/defaults/main.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_common/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/roles/openshift_common/defaults/main.yml b/roles/openshift_common/defaults/main.yml index 20b6f082c..a541591fb 100644 --- a/roles/openshift_common/defaults/main.yml +++ b/roles/openshift_common/defaults/main.yml @@ -1,3 +1,8 @@ --- 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 +openshift_hostname: "{{ openshift_public_ip if openshift_hostname_workaround else ansible_fqdn }}" 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 diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 0b3842856..ef915d63b 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -16,8 +16,8 @@ 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_hostname }} --nodes={{ openshift_node_ips + | join(',') }} --loglevel={{ openshift_master_debug_level }}\"" notify: - restart openshift-master |