summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-07 16:02:49 -0500
committerGitHub <noreply@github.com>2016-11-07 16:02:49 -0500
commitf5f7937a89deceae5795987d2eeae26810499b99 (patch)
tree8122968040ebe5addd66fd4e4520e10dc56fa623 /roles/openshift_facts/library
parent24b351d565835fbc287007c37dbf8ee9d94d8398 (diff)
parentb50b4ea0b03feb9431abd7294fe4fb6b549ddfc0 (diff)
downloadopenshift-f5f7937a89deceae5795987d2eeae26810499b99.tar.gz
openshift-f5f7937a89deceae5795987d2eeae26810499b99.tar.bz2
openshift-f5f7937a89deceae5795987d2eeae26810499b99.tar.xz
openshift-f5f7937a89deceae5795987d2eeae26810499b99.zip
Merge pull request #2652 from smunilla/BZ1320952_default_for_clusterNetworkCIDR
Update defaults for clusterNetworkCIDR & hostSubnetLength
Diffstat (limited to 'roles/openshift_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py24
1 files changed, 19 insertions, 5 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 95325610d..769d11a42 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -901,10 +901,24 @@ def set_sdn_facts_if_unset(facts, system_facts):
facts['common']['sdn_network_plugin_name'] = plugin
if 'master' in facts:
- if 'sdn_cluster_network_cidr' not in facts['master']:
- facts['master']['sdn_cluster_network_cidr'] = '10.1.0.0/16'
- if 'sdn_host_subnet_length' not in facts['master']:
- facts['master']['sdn_host_subnet_length'] = '8'
+ # set defaults for sdn_cluster_network_cidr and sdn_host_subnet_length
+ # these might be overridden if they exist in the master config file
+ facts['master']['sdn_cluster_network_cidr'] = '10.128.0.0/14'
+ facts['master']['sdn_host_subnet_length'] = '9'
+
+ master_cfg_path = os.path.join(facts['common']['config_base'],
+ 'master/master-config.yaml')
+ if os.path.isfile(master_cfg_path):
+ with open(master_cfg_path, 'r') as master_cfg_f:
+ config = yaml.safe_load(master_cfg_f.read())
+
+ if 'networkConfig' in config:
+ if 'clusterNetworkCIDR' in config['networkConfig']:
+ facts['master']['sdn_cluster_network_cidr'] = \
+ config['networkConfig']['clusterNetworkCIDR']
+ if 'hostSubnetLength' in config['networkConfig']:
+ facts['master']['sdn_host_subnet_length'] = \
+ config['networkConfig']['hostSubnetLength']
if 'node' in facts and 'sdn_mtu' not in facts['node']:
node_ip = facts['common']['ip']
@@ -1774,8 +1788,8 @@ class OpenShiftFacts(object):
facts = set_node_schedulability(facts)
facts = set_selectors(facts)
facts = set_identity_providers_if_unset(facts)
- facts = set_sdn_facts_if_unset(facts, self.system_facts)
facts = set_deployment_facts_if_unset(facts)
+ facts = set_sdn_facts_if_unset(facts, self.system_facts)
facts = set_container_facts_if_unset(facts)
facts = build_kubelet_args(facts)
facts = build_controller_args(facts)