github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Fix race condition in start-up of salt-minion and salt-master

Browse Source
This commit is contained in:
derekwaynecarr 2014-10-14 12:41:45 -04:00
parent ebba1aed7d
commit b8d2f08192
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,7 @@ python "${KUBE_ROOT}/third_party/htpasswd/htpasswd.py" -b -c "${KUBE_TEMP}/htpas
MASTER_HTPASSWD=$(cat "${KUBE_TEMP}/htpasswd") MASTER_HTPASSWD=$(cat "${KUBE_TEMP}/htpasswd")
echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd
# we will run provision to update code each time we test, so we do not want to do salt install each time # we will run provision to update code each time we test, so we do not want to do salt installs each time
if ! which salt-master >/dev/null 2>&1; then if ! which salt-master >/dev/null 2>&1; then
# Configure the salt-api # Configure the salt-api
@ -130,10 +130,12 @@ rest_cherrypy:
webhook_disable_auth: True webhook_disable_auth: True
EOF EOF
# Install Salt
# Install Salt Master
# #
# -M installs the master # -M installs the master
curl -sS -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s -- -M # -N does not install the minion
curl -sS -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s -- -M -N
# Install salt-api # Install salt-api
# #
@ -144,6 +146,13 @@ EOF
SYSTEMD_LOG_LEVEL=notice systemctl enable salt-api SYSTEMD_LOG_LEVEL=notice systemctl enable salt-api
systemctl start salt-api systemctl start salt-api
fi
if ! which salt-minion >/dev/null 2>&1; then
# Install Salt minion
curl -sS -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s
else else
# Only run highstate when updating the config. In the first-run case, Salt is # Only run highstate when updating the config. In the first-run case, Salt is
# 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.