From a323335d361819d3fd81ae5209cd2fa881d28c16 Mon Sep 17 00:00:00 2001
From: Smaine Kahlouch <smaine.kahlouch@arkena.com>
Date: Wed, 27 Jan 2016 22:00:12 +0100
Subject: [PATCH] use 'kube_pods_subnet' var for flannel conf
---
roles/apps/k8s-postgres | 2 +-
roles/network_plugin/templates/flannel/network.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/roles/apps/k8s-postgres b/roles/apps/k8s-postgres
index 0f9cda318..a03a14c46 160000
--- a/roles/apps/k8s-postgres
+++ b/roles/apps/k8s-postgres
@@ -1 +1 @@
-Subproject commit 0f9cda318283ba67b73ba57e794347cbffb2a169
+Subproject commit a03a14c46f19732fa7a3ee37a37d9f0375a6e2d2
diff --git a/roles/network_plugin/templates/flannel/network.json b/roles/network_plugin/templates/flannel/network.json
index 6c64556ee..8f28ff15d 100644
--- 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" } }
--
GitLab