Fix hostname handling

- always set hostname if hostname does not match openshift_hostname
- Use local IP instead of public IP as hostname for workaround

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 |

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 }}"

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