summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/tasks
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-03-15 11:20:29 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-03-15 11:20:29 -0400
commitbd1976e5e90847ed5d22fdbef9ecf69e7883458c (patch)
treef838f1de42b4d7e7a607bb5f6d8459c1cf099873 /roles/openshift_node/tasks
parent28e470b4e6bb526a489aba65e875ac4672e279e2 (diff)
parent9700b7b66789f300bbe99743719ca699457b3b91 (diff)
downloadopenshift-bd1976e5e90847ed5d22fdbef9ecf69e7883458c.tar.gz
openshift-bd1976e5e90847ed5d22fdbef9ecf69e7883458c.tar.bz2
openshift-bd1976e5e90847ed5d22fdbef9ecf69e7883458c.tar.xz
openshift-bd1976e5e90847ed5d22fdbef9ecf69e7883458c.zip
Merge pull request #1603 from detiber/move_common_common_facts
Move common common facts to openshift_facts
Diffstat (limited to 'roles/openshift_node/tasks')
-rw-r--r--roles/openshift_node/tasks/main.yml4
1 files changed, 1 insertions, 3 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 54ba2aa6a..8768d426b 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -11,10 +11,8 @@
with_items:
- role: common
local_facts:
- hostname: "{{ openshift_hostname | default(none) }}"
- public_hostname: "{{ openshift_public_hostname | default(none) }}"
- deployment_type: "{{ openshift_deployment_type }}"
# TODO: Replace this with a lookup or filter plugin.
+ # TODO: Move this to the node role
dns_ip: "{{ openshift_dns_ip
| default(openshift_master_cluster_vip
| default(None if openshift.common.version_gte_3_1_or_1_1 | bool else openshift_node_first_master_ip | default(None, true), true), true) }}"