Merge pull request #111 from Smana/flannel_pods_subnet

use 'kube_pods_subnet' var for flannel conf
2016-01-27 22:14:20 +01:00 · 2016-01-27 22:14:20 +01:00 · faf50ea698
parent f15dda0248 a323335d36
commit faf50ea698
2 changed files with 2 additions and 2 deletions
--- a/roles/apps/k8s-postgres
+++ b/roles/apps/k8s-postgres
@ -1 +1 @@
-Subproject commit 0f9cda318283ba67b73ba57e794347cbffb2a169
+Subproject commit a03a14c46f19732fa7a3ee37a37d9f0375a6e2d2
--- a/roles/network_plugin/templates/flannel/network.json
+++ b/roles/network_plugin/templates/flannel/network.json
@ -1 +1 @@
-{ "Network": "{{ kube_service_addresses }}", "SubnetLen": {{ kube_network_node_prefix }}, "Backend": { "Type": "vxlan" } }
+{ "Network": "{{ kube_pods_subnet }}", "SubnetLen": {{ kube_network_node_prefix }}, "Backend": { "Type": "vxlan" } }