summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2015-12-04 08:53:30 -0500
committerAndrew Butcher <abutcher@redhat.com>2015-12-08 13:30:23 -0500
commit208063939b6b97b80b4bd3ab12358fb745993d44 (patch)
treee006de282b2ed7f39ae3007c6653d304500c0fad /roles
parent64d40b71f3b52b69999831a7d6e13916ec5ad1cd (diff)
downloadopenshift-208063939b6b97b80b4bd3ab12358fb745993d44.tar.gz
openshift-208063939b6b97b80b4bd3ab12358fb745993d44.tar.bz2
openshift-208063939b6b97b80b4bd3ab12358fb745993d44.tar.xz
openshift-208063939b6b97b80b4bd3ab12358fb745993d44.zip
Pass in and use first_master_ip as dnsIP for pre 3.1 nodes.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_node/tasks/main.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 29e7eb532..110556b4a 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -14,7 +14,10 @@
hostname: "{{ openshift_hostname | default(none) }}"
public_hostname: "{{ openshift_public_hostname | default(none) }}"
deployment_type: "{{ openshift_deployment_type }}"
- dns_ip: "{{ openshift_dns_ip | default(openshift_master_cluster_vip | default(None, true), true) }}"
+ # TODO: Replace this with a lookup or filter plugin.
+ dns_ip: "{{ openshift_dns_ip
+ | default(openshift_master_cluster_vip
+ | default(None if openshift.common.version_greater_than_3_1_or_1_1 | bool else openshift_node_first_master_ip | default(None, true), true), true) }}"
- role: node
local_facts:
annotations: "{{ openshift_node_annotations | default(none) }}"