summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-02-05 15:04:26 -0500
committerScott Dodson <sdodson@redhat.com>2016-04-19 16:43:48 -0400
commit7c11c212a270ea4da9094ed3156db91090b8c851 (patch)
treeb2f2132c4dbf5e61577af2e75144390c7e5351ea /roles/openshift_node
parent1f490c2374038669df3d2bfcb01af54361f8907e (diff)
downloadopenshift-7c11c212a270ea4da9094ed3156db91090b8c851.tar.gz
openshift-7c11c212a270ea4da9094ed3156db91090b8c851.tar.bz2
openshift-7c11c212a270ea4da9094ed3156db91090b8c851.tar.xz
openshift-7c11c212a270ea4da9094ed3156db91090b8c851.zip
Promote portal_net to openshift.common, add kube_svc_ip
Conflicts: roles/openshift_facts/library/openshift_facts.py
Diffstat (limited to 'roles/openshift_node')
-rw-r--r--roles/openshift_node/tasks/main.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 8987e0191..94a5d9da8 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -16,6 +16,7 @@
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) }}"
+ portal_net: "{{ openshift_portal_net | default(openshift_master_portal_net) | default(None) }}"
- role: node
local_facts:
annotations: "{{ openshift_node_annotations | default(none) }}"