github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add 'portal_net' parameter to pillar

Browse Source 
In preparation for #1402.
This commit is contained in:
Pieter Noordhuis
2014-10-12 18:20:17 -07:00
parent 4a13d752ed
commit fa24face8c
4 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/vsphere/config-default.sh
View File

@@ -30,3 +30,5 @@ MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${NUM_MINIONS}}))
MINION_IP_RANGES=($(eval echo "10.244.{1..${NUM_MINIONS}}.0/24")) MINION_IP_RANGES=($(eval echo "10.244.{1..${NUM_MINIONS}}.0/24"))
MINION_MEMORY_MB=2048 MINION_MEMORY_MB=2048
MINION_CPU=1 MINION_CPU=1
PORTAL_NET="10.244.240.0/20"

2
cluster/vsphere/config-test.sh
View File

@@ -30,3 +30,5 @@ MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${NUM_MINIONS}}))
MINION_IP_RANGES=($(eval echo "10.244.{1..${NUM_MINIONS}}.0/24")) MINION_IP_RANGES=($(eval echo "10.244.{1..${NUM_MINIONS}}.0/24"))
MINION_MEMORY_MB=1024 MINION_MEMORY_MB=1024
MINION_CPU=1 MINION_CPU=1
PORTAL_NET="10.244.240.0/20"

1
cluster/vsphere/templates/salt-master.sh
View File

@@ -30,6 +30,7 @@ EOF
cat <<EOF >/srv/pillar/cluster-params.sls cat <<EOF >/srv/pillar/cluster-params.sls
node_instance_prefix: $NODE_INSTANCE_PREFIX node_instance_prefix: $NODE_INSTANCE_PREFIX
portal_net: $PORTAL_NET
EOF EOF
# Auto accept all keys from minions that try to join # Auto accept all keys from minions that try to join

1
cluster/vsphere/util.sh
View File

@@ -290,6 +290,7 @@ function kube-up {
echo "cd /home/kube/cache/kubernetes-install" echo "cd /home/kube/cache/kubernetes-install"
echo "readonly MASTER_NAME='${MASTER_NAME}'" echo "readonly MASTER_NAME='${MASTER_NAME}'"
echo "readonly NODE_INSTANCE_PREFIX='${INSTANCE_PREFIX}-minion'" echo "readonly NODE_INSTANCE_PREFIX='${INSTANCE_PREFIX}-minion'"
echo "readonly PORTAL_NET='${PORTAL_NET}'"
echo "readonly SERVER_BINARY_TAR='${SERVER_BINARY_TAR##*/}'" echo "readonly SERVER_BINARY_TAR='${SERVER_BINARY_TAR##*/}'"
echo "readonly SALT_TAR='${SALT_TAR##*/}'" echo "readonly SALT_TAR='${SALT_TAR##*/}'"
echo "readonly MASTER_HTPASSWD='${htpasswd}'" echo "readonly MASTER_HTPASSWD='${htpasswd}'"