Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix Vagrant node registration and kube-push #8865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 27, 2015
Merged

Fix Vagrant node registration and kube-push #8865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cluster/vagrant/provision-master.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion pkg/cloudprovider/vagrant/vagrant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down