Merge "Fix StackLight v2 script after minion.d changes"
diff --git a/scripts/kubernetes_install.sh b/scripts/kubernetes_install.sh
index 092843d..1cd431a 100755
--- a/scripts/kubernetes_install.sh
+++ b/scripts/kubernetes_install.sh
@@ -2,34 +2,34 @@
exec > >(tee -i /tmp/"$(basename "$0" .sh)"_"$(date '+%Y-%m-%d_%H-%M-%S')".log) 2>&1
# Create and distribute SSL certificates for services using salt state
-salt --state-output=terse '*' state.sls salt
+salt '*' state.sls salt
# Install keepalived
-salt --state-output=terse -C 'I@keepalived:cluster' state.sls keepalived -b 1
+salt -C 'I@keepalived:cluster' state.sls keepalived -b 1
# Install haproxy
-salt --state-output=terse -C 'I@haproxy:proxy' state.sls haproxy
-salt --state-output=terse -C 'I@haproxy:proxy' service.status haproxy
+salt -C 'I@haproxy:proxy' state.sls haproxy
+salt -C 'I@haproxy:proxy' service.status haproxy
# Install docker
-salt --state-output=terse -C 'I@docker:host' state.sls docker.host
-salt --state-output=terse -C 'I@docker:host' cmd.run "docker ps"
+salt -C 'I@docker:host' state.sls docker.host
+salt -C 'I@docker:host' cmd.run "docker ps"
# Install etcd
-salt --state-output=terse -C 'I@etcd:server' state.sls etcd.server.service
-salt --state-output=terse -C 'I@etcd:server' cmd.run ". /var/lib/etcd/configenv && etcdctl cluster-health"
+salt -C 'I@etcd:server' state.sls etcd.server.service
+salt -C 'I@etcd:server' cmd.run ". /var/lib/etcd/configenv && etcdctl cluster-health"
# Install Kubernetes and Calico
-salt --state-output=terse -C 'I@kubernetes:master' state.sls kubernetes.master.kube-addons
-salt --state-output=terse -C 'I@kubernetes:pool' state.sls kubernetes.pool
-salt --state-output=terse -C 'I@kubernetes:pool' cmd.run "calicoctl node status"
-salt --state-output=terse -C 'I@kubernetes:pool' cmd.run "calicoctl get ippool"
+salt -C 'I@kubernetes:master' state.sls kubernetes.master.kube-addons
+salt -C 'I@kubernetes:pool' state.sls kubernetes.pool
+salt -C 'I@kubernetes:pool' cmd.run "calicoctl node status"
+salt -C 'I@kubernetes:pool' cmd.run "calicoctl get ippool"
# Setup NAT for Calico
-salt --state-output=terse -C 'I@kubernetes:master' --subset 1 state.sls etcd.server.setup
+salt -C 'I@kubernetes:master' --subset 1 state.sls etcd.server.setup
# Run whole master to check consistency
-salt --state-output=terse -C 'I@kubernetes:master' state.sls kubernetes exclude=kubernetes.master.setup
+salt -C 'I@kubernetes:master' state.sls kubernetes exclude=kubernetes.master.setup
# Register addons
-salt --state-output=terse -C 'I@kubernetes:master' --subset 1 state.sls kubernetes.master.setup
+salt -C 'I@kubernetes:master' --subset 1 state.sls kubernetes.master.setup
diff --git a/scripts/test_reclass.sh b/scripts/test_reclass.sh
index f477007..6cf4259 100755
--- a/scripts/test_reclass.sh
+++ b/scripts/test_reclass.sh
@@ -148,7 +148,7 @@
## Main
trap _atexit INT TERM EXIT
-masters=$(find nodes -type f -name cfg*.yml)
+masters=$(find nodes -type f -name 'cfg*.yml')
for master in ${masters[@]}; do
master=$(basename $master .yml)
log_info "Testing Salt master ${master}"