summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-12-08 13:36:53 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-12-08 13:36:53 -0500
commit5c57f251e5d0385221311b8c48b9683f1d80479e (patch)
treeac4e8495409a84aa1754e1f6b3b765ecb91796c8 /roles/openshift_node
parent0820488ba20ce749d0764f6a09aa4e7e6d227801 (diff)
parent208063939b6b97b80b4bd3ab12358fb745993d44 (diff)
downloadopenshift-5c57f251e5d0385221311b8c48b9683f1d80479e.tar.gz
openshift-5c57f251e5d0385221311b8c48b9683f1d80479e.tar.bz2
openshift-5c57f251e5d0385221311b8c48b9683f1d80479e.tar.xz
openshift-5c57f251e5d0385221311b8c48b9683f1d80479e.zip
Merge pull request #1020 from abutcher/pre-3.1-dnsip
Default 3.0.x dnsIP
Diffstat (limited to 'roles/openshift_node')
-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) }}"