summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-09-06 13:21:51 -0400
committerGitHub <noreply@github.com>2017-09-06 13:21:51 -0400
commit9453ee0fe87cea7e8e40a5a932793cbcbf0d6506 (patch)
tree41c17368562ce2221fa8d54a9f8b8813ec4d144a
parent187da956be9d05a403cb899a73c6c7bc7a5ab424 (diff)
parent98db8ecfabd3e38a3e0fc2fdf2f4a9bea53b7e2e (diff)
downloadopenshift-9453ee0fe87cea7e8e40a5a932793cbcbf0d6506.tar.gz
openshift-9453ee0fe87cea7e8e40a5a932793cbcbf0d6506.tar.bz2
openshift-9453ee0fe87cea7e8e40a5a932793cbcbf0d6506.tar.xz
openshift-9453ee0fe87cea7e8e40a5a932793cbcbf0d6506.zip
Merge pull request #5067 from e-minguez/flannel_use_sdn_cluster_network_cidr
Use the proper pod subnet instead the services one
-rw-r--r--roles/flannel_register/defaults/main.yaml5
-rw-r--r--roles/flannel_register/templates/flannel-config.json1
2 files changed, 2 insertions, 4 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"
diff --git a/roles/flannel_register/templates/flannel-config.json b/roles/flannel_register/templates/flannel-config.json
index 89ce4c30b..bba3729fa 100644
--- a/roles/flannel_register/templates/flannel-config.json
+++ b/roles/flannel_register/templates/flannel-config.json
@@ -1,7 +1,6 @@
{
"Network": "{{ flannel_network }}",
"SubnetLen": {{ flannel_subnet_len }},
- "SubnetMin": "{{ flannel_min_network }}",
"Backend": {
"Type": "host-gw"
}