[suse] Add min and max to flannel_network_subnet option
Change-Id: I7d5e9a545b9996e0036cd685fea52573416bd82f Partial-Bug: #1622949
This commit is contained in:
parent
a60529cb11
commit
d7ed87e9ae
@ -30,6 +30,8 @@ cat > $FLANNEL_JSON <<EOF
|
|||||||
{
|
{
|
||||||
"Network": "$FLANNEL_NETWORK_CIDR",
|
"Network": "$FLANNEL_NETWORK_CIDR",
|
||||||
"Subnetlen": $FLANNEL_NETWORK_SUBNETLEN,
|
"Subnetlen": $FLANNEL_NETWORK_SUBNETLEN,
|
||||||
|
"SubnetMin": "$FLANNEL_NETWORK_SUBNET_MIN",
|
||||||
|
"SubnetMax": "$FLANNEL_NETWORK_SUBNET_MAX",
|
||||||
"Backend": {
|
"Backend": {
|
||||||
"Type": "$FLANNEL_BACKEND"
|
"Type": "$FLANNEL_BACKEND"
|
||||||
}
|
}
|
||||||
|
@ -11,6 +11,8 @@ write_files:
|
|||||||
NETWORK_DRIVER="$NETWORK_DRIVER"
|
NETWORK_DRIVER="$NETWORK_DRIVER"
|
||||||
FLANNEL_NETWORK_CIDR="$FLANNEL_NETWORK_CIDR"
|
FLANNEL_NETWORK_CIDR="$FLANNEL_NETWORK_CIDR"
|
||||||
FLANNEL_NETWORK_SUBNETLEN="$FLANNEL_NETWORK_SUBNETLEN"
|
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"
|
FLANNEL_BACKEND="$FLANNEL_BACKEND"
|
||||||
PORTAL_NETWORK_CIDR="$PORTAL_NETWORK_CIDR"
|
PORTAL_NETWORK_CIDR="$PORTAL_NETWORK_CIDR"
|
||||||
ETCD_DISCOVERY_URL="$ETCD_DISCOVERY_URL"
|
ETCD_DISCOVERY_URL="$ETCD_DISCOVERY_URL"
|
||||||
|
@ -71,6 +71,16 @@ parameters:
|
|||||||
description: size of subnet assigned to each minion
|
description: size of subnet assigned to each minion
|
||||||
default: 24
|
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:
|
flannel_backend:
|
||||||
type: string
|
type: string
|
||||||
description: >
|
description: >
|
||||||
@ -487,6 +497,8 @@ resources:
|
|||||||
flannel_backend: {get_param: flannel_backend}
|
flannel_backend: {get_param: flannel_backend}
|
||||||
flannel_network_cidr: {get_param: flannel_network_cidr}
|
flannel_network_cidr: {get_param: flannel_network_cidr}
|
||||||
flannel_network_subnetlen: {get_param: flannel_network_subnetlen}
|
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}
|
portal_network_cidr: {get_param: portal_network_cidr}
|
||||||
discovery_url: {get_param: discovery_url}
|
discovery_url: {get_param: discovery_url}
|
||||||
cluster_uuid: {get_param: cluster_uuid}
|
cluster_uuid: {get_param: cluster_uuid}
|
||||||
|
@ -49,6 +49,16 @@ parameters:
|
|||||||
description: size of subnet assigned to each master
|
description: size of subnet assigned to each master
|
||||||
default: 24
|
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:
|
flannel_backend:
|
||||||
type: string
|
type: string
|
||||||
description: >
|
description: >
|
||||||
@ -197,6 +207,8 @@ resources:
|
|||||||
"$NETWORK_DRIVER": {get_param: network_driver}
|
"$NETWORK_DRIVER": {get_param: network_driver}
|
||||||
"$FLANNEL_NETWORK_CIDR": {get_param: flannel_network_cidr}
|
"$FLANNEL_NETWORK_CIDR": {get_param: flannel_network_cidr}
|
||||||
"$FLANNEL_NETWORK_SUBNETLEN": {get_param: flannel_network_subnetlen}
|
"$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}
|
"$FLANNEL_BACKEND": {get_param: flannel_backend}
|
||||||
"$PORTAL_NETWORK_CIDR": {get_param: portal_network_cidr}
|
"$PORTAL_NETWORK_CIDR": {get_param: portal_network_cidr}
|
||||||
"$ETCD_DISCOVERY_URL": {get_param: discovery_url}
|
"$ETCD_DISCOVERY_URL": {get_param: discovery_url}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user