summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-04-26 14:48:21 -0400
committerJason DeTiberus <detiber@gmail.com>2016-04-26 14:48:21 -0400
commitc934467629cdf1369c8e2a080a81dc54f154276a (patch)
tree461895fc3d36e733feebf8a0aeb08344e115dd95 /roles/openshift_facts
parent2833d9a86a0e8dddc1cfb0c481d341498da0e0c1 (diff)
parent927278059ae25e97ada2161903c571409c2bc151 (diff)
downloadopenshift-c934467629cdf1369c8e2a080a81dc54f154276a.tar.gz
openshift-c934467629cdf1369c8e2a080a81dc54f154276a.tar.bz2
openshift-c934467629cdf1369c8e2a080a81dc54f154276a.tar.xz
openshift-c934467629cdf1369c8e2a080a81dc54f154276a.zip
Merge pull request #1809 from abutcher/portal-net
BZ 1330357: Fail to deploy pod after installing env with openshift_master_portal_net='172.31.0.0/16'
Diffstat (limited to 'roles/openshift_facts')
-rw-r--r--roles/openshift_facts/tasks/main.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml
index 7510e4e39..8077c0d97 100644
--- a/roles/openshift_facts/tasks/main.yml
+++ b/roles/openshift_facts/tasks/main.yml
@@ -33,6 +33,7 @@
is_containerized: "{{ l_is_containerized | default(None) }}"
public_hostname: "{{ openshift_public_hostname | default(None) }}"
public_ip: "{{ openshift_public_ip | default(None) }}"
+ portal_net: "{{ openshift_portal_net | default(openshift_master_portal_net) | default(None) }}"
# had to be done outside of the above because hostname isn't yet set
- name: Gather hostnames for proxy configuration