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

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

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