summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--roles/flannel/tasks/main.yml2
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py13
2 files changed, 10 insertions, 5 deletions
diff --git a/roles/flannel/tasks/main.yml b/roles/flannel/tasks/main.yml
index f5b16fb76..a15969568 100644
--- a/roles/flannel/tasks/main.yml
+++ b/roles/flannel/tasks/main.yml
@@ -2,7 +2,7 @@
- name: Install flannel
become: yes
action: "{{ ansible_pkg_mgr }} name=flannel state=present"
- when: not openshift.common.is_containerized | bool
+ when: not openshift.common.is_atomic | bool
- name: Set flannel etcd options
become: yes
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 769d11a42..c75b3c0c9 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -903,8 +903,8 @@ def set_sdn_facts_if_unset(facts, system_facts):
if 'master' in facts:
# 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'
+ sdn_cluster_network_cidr = '10.128.0.0/14'
+ sdn_host_subnet_length = '9'
master_cfg_path = os.path.join(facts['common']['config_base'],
'master/master-config.yaml')
@@ -914,12 +914,17 @@ def set_sdn_facts_if_unset(facts, system_facts):
if 'networkConfig' in config:
if 'clusterNetworkCIDR' in config['networkConfig']:
- facts['master']['sdn_cluster_network_cidr'] = \
+ sdn_cluster_network_cidr = \
config['networkConfig']['clusterNetworkCIDR']
if 'hostSubnetLength' in config['networkConfig']:
- facts['master']['sdn_host_subnet_length'] = \
+ sdn_host_subnet_length = \
config['networkConfig']['hostSubnetLength']
+ if 'sdn_cluster_network_cidr' not in facts['master']:
+ facts['master']['sdn_cluster_network_cidr'] = sdn_cluster_network_cidr
+ if 'sdn_host_subnet_length' not in facts['master']:
+ facts['master']['sdn_host_subnet_length'] = sdn_host_subnet_length
+
if 'node' in facts and 'sdn_mtu' not in facts['node']:
node_ip = facts['common']['ip']