Merge pull request kubernetes#4903 from derekwaynecarr/fix_vagrant_in…

…stance_prefix Fix error provisioning kube-apiserver on vagrant
duda · Feb 27, 2015 · d98b081 · d98b081
2 parents 3a21d29 + 5fdf6b1
commit d98b081
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/cluster/vagrant/config-default.sh b/cluster/vagrant/config-default.sh
@@ -23,7 +23,7 @@ export NUM_MINIONS
 # The IP of the master
 export MASTER_IP="10.245.1.2"
 
-export INSTANCE_PREFIX=kubernetes
+export INSTANCE_PREFIX="kubernetes"
 export MASTER_NAME="${INSTANCE_PREFIX}-master"
 
 # Map out the IPs, names and container subnets of each minion

diff --git a/cluster/vagrant/provision-master.sh b/cluster/vagrant/provision-master.sh
@@ -101,6 +101,7 @@ cat <<EOF >/srv/salt-overlay/pillar/cluster-params.sls
   dns_replicas: '$(echo "$DNS_REPLICAS" | sed -e "s/'/''/g")'
   dns_server: '$(echo "$DNS_SERVER_IP" | sed -e "s/'/''/g")'
   dns_domain: '$(echo "$DNS_DOMAIN" | sed -e "s/'/''/g")'
+  instance_prefix: '$(echo "$INSTANCE_PREFIX" | sed -e "s/'/''/g")'
 EOF
 
 # Configure the salt-master