stackforge/heat-coe-templates
Code Issues Proposed changes

make portal_net address range a parameter

Browse Source
This commit is contained in:
Lars Kellogg-Stedman 2015-01-02 13:24:23 -05:00
parent 8bf59371da
commit 18d9c6e683
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fragments/configure-kubernetes-master.sh
View File

@ -10,6 +10,7 @@ sed -i '
sed -i '
/^KUBE_API_ADDRESS=/ s/=.*/="--address=0.0.0.0"/
/^KUBE_SERVICE_ADDRESSES=/ s/=.*/="--portal_net='"$PORTAL_NETWORK_CIDR"'"/
' /etc/kubernetes/apiserver
sed -i '

1
fragments/write-heat-params-master.yaml
View File

@ -11,3 +11,4 @@ write_files:
FLANNEL_NETWORK_CIDR="$FLANNEL_NETWORK_CIDR"
FLANNEL_NETWORK_SUBNETLEN="$FLANNEL_NETWORK_SUBNETLEN"
FLANNEL_USE_VXLAN="$FLANNEL_USE_VXLAN"
PORTAL_NETWORK_CIDR="$PORTAL_NETWORK_CIDR"

11
kubecluster.yaml
View File

@ -44,12 +44,18 @@ parameters:
fixed_network_cidr:
type: string
description: network range for fixed ip network
default: 10.0.0.0/24
default: "10.0.0.0/24"
portal_network_cidr:
type: string
description: >
address range used by kubernetes for service portals
default: "10.254.0.0/16"
flannel_network_cidr:
type: string
description: network range for flannel overlay network
default: 10.100.0.0/16
default: "10.100.0.0/16"
flannel_network_subnetlen:
type: string
@ -181,6 +187,7 @@ resources:
"$FLANNEL_NETWORK_CIDR": {get_param: flannel_network_cidr}
"$FLANNEL_NETWORK_SUBNETLEN": {get_param: flannel_network_subnetlen}
"$FLANNEL_USE_VXLAN": {get_param: flannel_use_vxlan}
"$PORTAL_NETWORK_CIDR": {get_param: portal_network_cidr}
configure_kubernetes:
type: "OS::Heat::SoftwareConfig"