From d7ed87e9aeb5f8763b73b5eba5af28af1b69416e Mon Sep 17 00:00:00 2001
From: Michal Jura <mjura@suse.com>
Date: Fri, 25 Nov 2016 11:15:22 +0100
Subject: [PATCH] [suse] Add min and max to flannel_network_subnet option

Change-Id: I7d5e9a545b9996e0036cd685fea52573416bd82f
Partial-Bug: #1622949
---
 .../templates/fragments/configure-flanneld-master.sh |  2 ++
 .../fragments/write-heat-params-master.yaml          |  2 ++
 .../k8s_opensuse_v1/templates/kubecluster.yaml       | 12 ++++++++++++
 .../k8s_opensuse_v1/templates/kubemaster.yaml        | 12 ++++++++++++
 4 files changed, 28 insertions(+)

diff --git a/contrib/drivers/k8s_opensuse_v1/templates/fragments/configure-flanneld-master.sh b/contrib/drivers/k8s_opensuse_v1/templates/fragments/configure-flanneld-master.sh
index 844f57bf42..0e2c9c4467 100644
--- a/contrib/drivers/k8s_opensuse_v1/templates/fragments/configure-flanneld-master.sh
+++ b/contrib/drivers/k8s_opensuse_v1/templates/fragments/configure-flanneld-master.sh
@@ -30,6 +30,8 @@ cat > $FLANNEL_JSON <<EOF
 {
   "Network": "$FLANNEL_NETWORK_CIDR",
   "Subnetlen": $FLANNEL_NETWORK_SUBNETLEN,
+  "SubnetMin": "$FLANNEL_NETWORK_SUBNET_MIN",
+  "SubnetMax": "$FLANNEL_NETWORK_SUBNET_MAX",
   "Backend": {
     "Type": "$FLANNEL_BACKEND"
   }
diff --git a/contrib/drivers/k8s_opensuse_v1/templates/fragments/write-heat-params-master.yaml b/contrib/drivers/k8s_opensuse_v1/templates/fragments/write-heat-params-master.yaml
index 2748c06103..1ffd3bebcc 100644
--- a/contrib/drivers/k8s_opensuse_v1/templates/fragments/write-heat-params-master.yaml
+++ b/contrib/drivers/k8s_opensuse_v1/templates/fragments/write-heat-params-master.yaml
@@ -11,6 +11,8 @@ write_files:
       NETWORK_DRIVER="$NETWORK_DRIVER"
       FLANNEL_NETWORK_CIDR="$FLANNEL_NETWORK_CIDR"
       FLANNEL_NETWORK_SUBNETLEN="$FLANNEL_NETWORK_SUBNETLEN"
+      FLANNEL_NETWORK_SUBNET_MIN="$FLANNEL_NETWORK_SUBNET_MIN"
+      FLANNEL_NETWORK_SUBNET_MAX="$FLANNEL_NETWORK_SUBNET_MAX"
       FLANNEL_BACKEND="$FLANNEL_BACKEND"
       PORTAL_NETWORK_CIDR="$PORTAL_NETWORK_CIDR"
       ETCD_DISCOVERY_URL="$ETCD_DISCOVERY_URL"
diff --git a/contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml b/contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml
index a623c068c9..d929f0edda 100644
--- a/contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml
+++ b/contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml
@@ -71,6 +71,16 @@ parameters:
     description: size of subnet assigned to each minion
     default: 24
 
+  flannel_network_subnet_min:
+    type: string
+    description: minimum subnet
+    default: 10.100.50.0
+
+  flannel_network_subnet_max:
+    type: string
+    description: maximum subnet
+    default: 10.100.199.0
+
   flannel_backend:
     type: string
     description: >
@@ -487,6 +497,8 @@ resources:
           flannel_backend: {get_param: flannel_backend}
           flannel_network_cidr: {get_param: flannel_network_cidr}
           flannel_network_subnetlen: {get_param: flannel_network_subnetlen}
+          flannel_network_subnet_min: {get_param: flannel_network_subnet_min}
+          flannel_network_subnet_max: {get_param: flannel_network_subnet_max}
           portal_network_cidr: {get_param: portal_network_cidr}
           discovery_url: {get_param: discovery_url}
           cluster_uuid: {get_param: cluster_uuid}
diff --git a/contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml b/contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml
index 34a7a951b6..a3f5607944 100644
--- a/contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml
+++ b/contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml
@@ -49,6 +49,16 @@ parameters:
     description: size of subnet assigned to each master
     default: 24
 
+  flannel_network_subnet_min:
+    type: string
+    description: minimum subnet
+    default: 10.100.50.0
+
+  flannel_network_subnet_max:
+    type: string
+    description: maximum subnet
+    default: 10.100.199.0
+
   flannel_backend:
     type: string
     description: >
@@ -197,6 +207,8 @@ resources:
             "$NETWORK_DRIVER": {get_param: network_driver}
             "$FLANNEL_NETWORK_CIDR": {get_param: flannel_network_cidr}
             "$FLANNEL_NETWORK_SUBNETLEN": {get_param: flannel_network_subnetlen}
+            "$FLANNEL_NETWORK_SUBNET_MIN": {get_param: flannel_network_subnet_min}
+            "$FLANNEL_NETWORK_SUBNET_MAX": {get_param: flannel_network_subnet_max}
             "$FLANNEL_BACKEND": {get_param: flannel_backend}
             "$PORTAL_NETWORK_CIDR": {get_param: portal_network_cidr}
             "$ETCD_DISCOVERY_URL": {get_param: discovery_url}