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

Merge pull request #1080 from filbranden/vagrant_salt_master1

Browse Source 
Fix `which salt-master` warning in Vagrant startup
This commit is contained in:
Clayton Coleman 2014-08-28 13:17:34 -04:00
commit 2f74a15a7b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@ MASTER_HTPASSWD=$(cat ${KUBE_TEMP}/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
if [ ! $(which salt-master) ]; then
if ! which salt-master >/dev/null 2>&1; then
# Configure the salt-api
cat <<EOF >/etc/salt/master.d/salt-api.conf

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

@ -41,7 +41,7 @@ grains:
EOF
# we will run provision to update code each time we test, so we do not want to do salt install each time
if [ ! $(which salt-minion) ]; then
if ! which salt-minion >/dev/null 2>&1; then
# Install Salt
#
# We specify -X to avoid a race condition that can cause minion failure to