github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8865 from derekwaynecarr/fix_kube_push

Browse Source 
Fix Vagrant node registration and kube-push
This commit is contained in:
Tim Hockin 2015-05-27 12:42:13 -07:00
commit b74786c1b6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/vagrant/provision-master.sh
View File

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

2
pkg/cloudprovider/vagrant/vagrant.go
View File

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