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

Merge pull request #932 from derekwaynecarr/issue_923

Browse Source 
Revert to latest salt bootstrap and force SSL
This commit is contained in:
Daniel Smith 2014-08-18 10:14:23 -07:00
commit 82d1f8d4f6
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,14 +69,7 @@ if [ ! $(which salt-master) ]; then
# install. See https://github.com/saltstack/salt-bootstrap/issues/270 # install. See https://github.com/saltstack/salt-bootstrap/issues/270
# #
# -M installs the master # -M installs the master
# FIXME: The following line should be replaced with: curl -sS -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s -- -M
# curl -L http://bootstrap.saltstack.com | sh -s -- -M
# when the merged salt-api service is included in the fedora salt-master rpm
# Merge is here: https://github.com/saltstack/salt/pull/13554
# Fedora git repository is here: http://pkgs.fedoraproject.org/cgit/salt.git/
# (a new service file needs to be added for salt-api)
curl -sS -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/v2014.06.30/bootstrap-salt.sh | sh -s -- -M
fi fi
# Build release # Build release

2
cluster/vagrant/provision-minion.sh
View File

@ -46,7 +46,7 @@ if [ ! $(which salt-minion) ]; then
# #
# We specify -X to avoid a race condition that can cause minion failure to # We specify -X to avoid a race condition that can cause minion failure to
# install. See https://github.com/saltstack/salt-bootstrap/issues/270 # install. See https://github.com/saltstack/salt-bootstrap/issues/270
curl -sS -L http://bootstrap.saltstack.com | sh -s -- -X curl -sS -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s -- -X
## TODO this only works on systemd distros, need to find a work-around as removing -X above fails to start the services installed ## TODO this only works on systemd distros, need to find a work-around as removing -X above fails to start the services installed
systemctl enable salt-minion systemctl enable salt-minion