summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorTroy Dawson <tdawson@redhat.com>2015-06-12 17:10:02 -0500
committerTroy Dawson <tdawson@redhat.com>2015-06-12 17:10:02 -0500
commit15df494fb781dd1509854eeb366e981930b52c22 (patch)
tree6f2aa57ffdfceee3e7170d0648fce9979c6a2f91 /roles/openshift_facts/library
parentc650920bc7b0043e59fa3439f48f61d5fa211f2d (diff)
parentffb8bbe2fd6b85ab0f2c108292034931edae1747 (diff)
downloadopenshift-15df494fb781dd1509854eeb366e981930b52c22.tar.gz
openshift-15df494fb781dd1509854eeb366e981930b52c22.tar.bz2
openshift-15df494fb781dd1509854eeb366e981930b52c22.tar.xz
openshift-15df494fb781dd1509854eeb366e981930b52c22.zip
Merge branch 'master' into prod
Diffstat (limited to 'roles/openshift_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index e4d3bf26f..cb67a13de 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -705,7 +705,7 @@ class OpenShiftFacts(object):
defaults['master'] = master
if 'node' in roles:
- node = dict(pod_cidr='', labels={}, annotations={})
+ node = dict(pod_cidr='', labels={}, annotations={}, portal_net='172.30.0.0/16')
node['resources_cpu'] = self.system_facts['processor_cores']
node['resources_memory'] = int(
int(self.system_facts['memtotal_mb']) * 1024 * 1024 * 0.75