Merge pull request #24 from Projoke/patch-2
Add variable SCRIPTS
diff --git a/bootstrap.sh b/bootstrap.sh
index b3916d1..60c0c87 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -49,7 +49,7 @@
test -e /etc/lsb-release && eval $(cat /etc/lsb-release)
which lsb_release && DISTRIB_CODENAME=${DISTRIB_CODENAME:-$(lsb_release -cs)}
#
-export APT_REPOSITORY="deb [arch=amd64] http://apt.mirantis.com/${DISTRIB_CODENAME} ${DISTRIB_REVISION:-stable} salt"
+export APT_REPOSITORY=${APT_REPOSITORY:- deb [arch=amd64] http://apt.mirantis.com/${DISTRIB_CODENAME} ${DISTRIB_REVISION:-stable} salt}
export APT_REPOSITORY_GPG=${APT_REPOSITORY_GPG:-http://apt.mirantis.com/public.gpg}
# reclass
@@ -61,7 +61,7 @@
export FORMULAS_BRANCH=${FORMULAS_BRANCH:-master}
export FORMULAS_SOURCE=${FORMULAS_SOURCE:-pkg} # pkg/git
# essential set of formulas (known to by used on cfg01 node for most setups)
-FORMULAS_SALT_MASTER=${FORMULAS_SALT_MASTER:- $EXTRA_FORMULAS memcached openssh ntp nginx collectd sensu heka sphinx mysql grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal rsync docker keepalived aptly jenkins gerrit artifactory influxdb horizon}
+FORMULAS_SALT_MASTER=${FORMULAS_SALT_MASTER:- $EXTRA_FORMULAS maas memcached openssh ntp nginx collectd sensu heka sphinx mysql grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal rsync docker keepalived aptly jenkins gerrit artifactory influxdb horizon}
# minimal set of formulas for salt-master bootstrap
declare -a FORMULAS_SALT_MASTER=(linux reclass salt git $(echo $FORMULAS_SALT_MASTER))
export FORMULAS_SALT_MASTER
diff --git a/salt-master-init.sh b/salt-master-init.sh
index 6a2e1d5..4d4ac1c 100755
--- a/salt-master-init.sh
+++ b/salt-master-init.sh
@@ -11,7 +11,7 @@
## Env Options
options() {
export LC_ALL=C
- SALT_LOG_LEVEL="--state-verbose=false -lerror"
+ SALT_LOG_LEVEL="${SALT_LOG_LEVEL:- --state-verbose=false -lerror}"
SALT_OPTS="${SALT_OPTS:- --timeout=120 --state-output=changes --retcode-passthrough --force-color $SALT_LOG_LEVEL }"
RECLASS_ROOT=${RECLASS_ROOT:-/srv/salt/reclass}
BOOTSTRAP_SALTSTACK=${BOOTSTRAP_SALTSTACK:-True}
@@ -101,7 +101,7 @@
saltmaster_bootstrap() {
log_info "Salt master, minion setup (salt-master-setup.sh)"
- test -n "$MASTER_HOSTNAME" || echo "missing \$MASTER_HOSTNAME" && return
+ test -n "$MASTER_HOSTNAME" || (echo "missing \$MASTER_HOSTNAME" && return)
pgrep salt-master | sed /$$/d | xargs --no-run-if-empty -i{} $SUDO kill -9 {}
pkill -9 salt-minion