Merge pull request #8865 from derekwaynecarr/fix_kube_push

Fix Vagrant node registration and kube-push

cluster/vagrant/provision-master.sh

@@ -215,7 +215,7 @@ external_auth:
       - .*
 rest_cherrypy:
   port: 8000
-  host: 127.0.0.1
+  host: ${MASTER_IP}
   disable_ssl: True
   webhook_disable_auth: True
 EOF
@@ -248,5 +248,5 @@ else
   # set up to run highstate as new minions join for the first time.
   echo "Executing configuration"
   salt '*' mine.update
-  salt --show-timeout --force-color '*' state.highstate
+  salt --force-color '*' state.highstate
 fi

pkg/cloudprovider/vagrant/vagrant.go

@@ -73,7 +73,7 @@ type SaltMinionsResponse struct {
 // newVagrantCloud creates a new instance of VagrantCloud configured to talk to the Salt REST API.
 func newVagrantCloud() (*VagrantCloud, error) {
 	return &VagrantCloud{
-		saltURL:  "http://127.0.0.1:8000",
+		saltURL:  "http://kubernetes-master:8000",
 		saltUser: "vagrant",
 		saltPass: "vagrant",
 		saltAuth: "pam",