openstack/magnum
Code Issues Proposed changes

[suse] Add min and max to flannel_network_subnet option

Browse Source 
Change-Id: I7d5e9a545b9996e0036cd685fea52573416bd82f
Partial-Bug: #1622949
This commit is contained in:
Michal Jura 2016-11-25 11:15:22 +01:00
parent a60529cb11
commit d7ed87e9ae
4 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/drivers/k8s_opensuse_v1/templates/fragments/configure-flanneld-master.sh
View File

@ -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"
}

2
contrib/drivers/k8s_opensuse_v1/templates/fragments/write-heat-params-master.yaml
View File

@ -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"

12
contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml
View File

@ -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}

12
contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml
View File

@ -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}