From 86c1ddc121b2fac2533ba2d2ebe35de1b11e5c4d Mon Sep 17 00:00:00 2001 From: Filipe Brandenburger Date: Wed, 27 Aug 2014 22:08:35 -0700 Subject: [PATCH] Fix `which salt-master` warning in Vagrant startup The `which` command in Fedora 20 (differently from the one in Debian) prints to stderr when the binary is not found. Redirect both stdout and stderr to /dev/null to prevent messages from being printed by `which`. Check whether the binary exists or not by the exit status of `which` (non-zero means the binary does not exist) instead of checking for empty output. Tested: - Started a Vagrant cluster with `vagrant up` and confirmed these messages were gone. Checked master and minions for Kubernetes components using the systemd status commands. - Confirmed that the same error message for salt-minion is also suppressed from the output with this patch. Fixes: Issue #1079 Signed-off-by: Filipe Brandenburger --- cluster/vagrant/provision-master.sh | 2 +- cluster/vagrant/provision-minion.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/vagrant/provision-master.sh b/cluster/vagrant/provision-master.sh index b89c07c0f0a..663fde30771 100755 --- a/cluster/vagrant/provision-master.sh +++ b/cluster/vagrant/provision-master.sh @@ -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 </etc/salt/master.d/salt-api.conf diff --git a/cluster/vagrant/provision-minion.sh b/cluster/vagrant/provision-minion.sh index 26f63215f98..f6f9bc8c60e 100755 --- a/cluster/vagrant/provision-minion.sh +++ b/cluster/vagrant/provision-minion.sh @@ -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