From b3f3a8066787c2aa20318760de9dbc14f22b131f Mon Sep 17 00:00:00 2001 From: weixu Date: Tue, 16 Feb 2016 16:03:20 -0800 Subject: [PATCH] Set the default value for DEBUG in cluster/saltbase/salt/generate-cert/make-ca-cert.sh In commit 07d7cfd3, people add ${DEBUG} == "true" in file cluster/saltbase/salt/generate-cert/make-ca-cert.sh But the default value for DEBUG is not set. In that commit, it set the value of DEBUG in cluster/ubuntu/util.sh where it call this script. When using this script in saltstack to bring up cluster in other cloud platforms, it will fail to generate the cert since we set set -o nounset in make-ca-cert.sh and var DEBUG does not set. Set a default value for DEBUG here will fix this problem. --- cluster/saltbase/salt/generate-cert/make-ca-cert.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cluster/saltbase/salt/generate-cert/make-ca-cert.sh b/cluster/saltbase/salt/generate-cert/make-ca-cert.sh index 642b7083507..31e0b024f93 100755 --- a/cluster/saltbase/salt/generate-cert/make-ca-cert.sh +++ b/cluster/saltbase/salt/generate-cert/make-ca-cert.sh @@ -18,6 +18,8 @@ set -o errexit set -o nounset set -o pipefail +DEBUG="${DEBUG:-false}" + if [ "${DEBUG}" == "true" ]; then set -x fi