diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-03-17 11:09:12 -0400 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-03-18 15:47:05 -0400 |
| commit | 81628f94bad4b303212bf77752f62c03728e0168 (patch) | |
| tree | ead84a72fd3a5d94cc1ab9283392ce80fa5fd692 | |
| parent | db9cf8ef4f030f30391e021f360fe0c3db1dce74 (diff) | |
| download | openshift-81628f94bad4b303212bf77752f62c03728e0168.tar.gz openshift-81628f94bad4b303212bf77752f62c03728e0168.tar.bz2 openshift-81628f94bad4b303212bf77752f62c03728e0168.tar.xz openshift-81628f94bad4b303212bf77752f62c03728e0168.zip | |
Fix hostname handling
- always set hostname if hostname does not match openshift_hostname
- Use local IP instead of public IP as hostname for workaround
| -rw-r--r-- | roles/openshift_common/README.md | 1 | ||||
| -rw-r--r-- | roles/openshift_common/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_common/tasks/main.yml | 6 |
3 files changed, 3 insertions, 7 deletions
diff --git a/roles/openshift_common/README.md b/roles/openshift_common/README.md index c2ae609ff..79076ed19 100644 --- a/roles/openshift_common/README.md +++ b/roles/openshift_common/README.md @@ -14,7 +14,6 @@ Role Variables | Name | Default value | | |-------------------------------|------------------------------|----------------------------------------| -| openshift_bind_ip | ansible_default_ipv4.address | IP to use for local binding | | openshift_debug_level | 0 | Global openshift debug log verbosity | | openshift_hostname_workaround | True | Workaround needed to set hostname to IP address | | openshift_hostname | openshift_public_ip if openshift_hostname_workaround else ansible_fqdn | hostname to use for this instance | diff --git a/roles/openshift_common/defaults/main.yml b/roles/openshift_common/defaults/main.yml index a541591fb..eb6edbc03 100644 --- a/roles/openshift_common/defaults/main.yml +++ b/roles/openshift_common/defaults/main.yml @@ -1,8 +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 -openshift_hostname: "{{ openshift_public_ip if openshift_hostname_workaround else ansible_fqdn }}" +openshift_hostname: "{{ ansible_default_ipv4.address if openshift_hostname_workaround else ansible_fqdn }}" diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index 728bba4e4..07737a71f 100644 --- a/roles/openshift_common/tasks/main.yml +++ b/roles/openshift_common/tasks/main.yml @@ -1,8 +1,6 @@ --- -# 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: Set hostname + hostname: name={{ openshift_hostname }} - name: Configure local facts file file: path=/etc/ansible/facts.d/ state=directory mode=0750 |