summaryrefslogtreecommitdiffstats
path: root/roles/flannel_register/defaults
diff options
context:
space:
mode:
authorEduardo Minguez Perez <edu@redhat.com>2017-08-11 16:13:19 +0200
committerEduardo Minguez <edu@redhat.com>2017-08-29 16:27:31 +0200
commit98db8ecfabd3e38a3e0fc2fdf2f4a9bea53b7e2e (patch)
tree2084606752ec138753ddd0bbe9a979af5e610aa8 /roles/flannel_register/defaults
parentd25db0f66934ef08c802090be6f433a7035d3fd5 (diff)
downloadopenshift-98db8ecfabd3e38a3e0fc2fdf2f4a9bea53b7e2e.tar.gz
openshift-98db8ecfabd3e38a3e0fc2fdf2f4a9bea53b7e2e.tar.bz2
openshift-98db8ecfabd3e38a3e0fc2fdf2f4a9bea53b7e2e.tar.xz
openshift-98db8ecfabd3e38a3e0fc2fdf2f4a9bea53b7e2e.zip
Use the proper pod subnet instead the services one
Fixes #4809 ?
Diffstat (limited to 'roles/flannel_register/defaults')
-rw-r--r--roles/flannel_register/defaults/main.yaml5
1 files changed, 2 insertions, 3 deletions
diff --git a/roles/flannel_register/defaults/main.yaml b/roles/flannel_register/defaults/main.yaml
index ddf8230ec..71c8f38c3 100644
--- a/roles/flannel_register/defaults/main.yaml
+++ b/roles/flannel_register/defaults/main.yaml
@@ -1,7 +1,6 @@
---
-flannel_network: "{{ openshift.common.portal_net | default('172.30.0.0/16', true) }}"
-flannel_min_network: 172.30.5.0
-flannel_subnet_len: 24
+flannel_network: "{{ openshift.master.sdn_cluster_network_cidr }}"
+flannel_subnet_len: "{{ 32 - openshift.master.sdn_host_subnet_length }}"
flannel_etcd_key: /openshift.com/network
etcd_hosts: "{{ etcd_urls }}"
etcd_conf_dir: "{{ openshift.common.config_base }}/master"