diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-03-02 11:00:29 -0500 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-03-02 11:02:00 -0500 |
| commit | b8e4abd2f23409432f65c4bd4a48e3732adeea47 (patch) | |
| tree | 495fd94a77259c2efe36d89ab60f2baa608120c4 | |
| parent | 8fea5fec61fabac1a72e8cc2a0874501ed4458ac (diff) | |
| download | openshift-b8e4abd2f23409432f65c4bd4a48e3732adeea47.tar.gz openshift-b8e4abd2f23409432f65c4bd4a48e3732adeea47.tar.bz2 openshift-b8e4abd2f23409432f65c4bd4a48e3732adeea47.tar.xz openshift-b8e4abd2f23409432f65c4bd4a48e3732adeea47.zip | |
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.
| -rw-r--r-- | roles/openshift_common/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 3 |
2 files changed, 2 insertions, 2 deletions
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 }}" diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 1acc5b99b..ef915d63b 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/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 |