From 2f1dd9228f142c012a8100f211d0128b81525efc Mon Sep 17 00:00:00 2001 From: derekwaynecarr Date: Wed, 27 May 2015 10:50:57 -0400 Subject: [PATCH] Fix Vagrant node registration and kube-push --- cluster/vagrant/provision-master.sh | 4 ++-- pkg/cloudprovider/vagrant/vagrant.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/vagrant/provision-master.sh b/cluster/vagrant/provision-master.sh index b857e44d6b7..bdf9ba514d4 100755 --- a/cluster/vagrant/provision-master.sh +++ b/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 diff --git a/pkg/cloudprovider/vagrant/vagrant.go b/pkg/cloudprovider/vagrant/vagrant.go index 825802d150c..fcbb1f04ca2 100644 --- a/pkg/cloudprovider/vagrant/vagrant.go +++ b/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",