diff --git a/cluster/vsphere/config-default.sh b/cluster/vsphere/config-default.sh index aacbb2ac066..e8d9a637c9e 100755 --- a/cluster/vsphere/config-default.sh +++ b/cluster/vsphere/config-default.sh @@ -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_MEMORY_MB=2048 MINION_CPU=1 + +PORTAL_NET="10.244.240.0/20" diff --git a/cluster/vsphere/config-test.sh b/cluster/vsphere/config-test.sh index 46430466ec0..0c2b2f1608e 100755 --- a/cluster/vsphere/config-test.sh +++ b/cluster/vsphere/config-test.sh @@ -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_MEMORY_MB=1024 MINION_CPU=1 + +PORTAL_NET="10.244.240.0/20" diff --git a/cluster/vsphere/templates/salt-master.sh b/cluster/vsphere/templates/salt-master.sh index f694b2c6d63..1aafba6b17a 100755 --- a/cluster/vsphere/templates/salt-master.sh +++ b/cluster/vsphere/templates/salt-master.sh @@ -30,6 +30,7 @@ EOF cat </srv/pillar/cluster-params.sls node_instance_prefix: $NODE_INSTANCE_PREFIX +portal_net: $PORTAL_NET EOF # Auto accept all keys from minions that try to join diff --git a/cluster/vsphere/util.sh b/cluster/vsphere/util.sh index e2ca662e5a5..bc1448c4cdf 100755 --- a/cluster/vsphere/util.sh +++ b/cluster/vsphere/util.sh @@ -290,6 +290,7 @@ function kube-up { echo "cd /home/kube/cache/kubernetes-install" echo "readonly MASTER_NAME='${MASTER_NAME}'" echo "readonly NODE_INSTANCE_PREFIX='${INSTANCE_PREFIX}-minion'" + echo "readonly PORTAL_NET='${PORTAL_NET}'" echo "readonly SERVER_BINARY_TAR='${SERVER_BINARY_TAR##*/}'" echo "readonly SALT_TAR='${SALT_TAR##*/}'" echo "readonly MASTER_HTPASSWD='${htpasswd}'"