saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow setting the minions master address.

Browse source 
Refs #85 and #104.
This commit is contained in:
Pedro Algarvio 2014-02-15 23:29:10 +00:00
parent babdd5f10a
commit 5ca2f11be3
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
bootstrap-salt.sh
View file

@ -212,6 +212,8 @@ usage() {
with -c and -k.
-I If set, allow insecure connections while downloading any files. For
example, pass '--no-check-certificate' to 'wget' or '--insecure' to 'curl'
-A Pass the salt-master DNS name or IP. This will be stored under
\${BS_SALT_ETC_DIR}/minion.conf.d/master-address.conf
EOT
} # ---------- end of function usage ----------
@ -242,10 +244,11 @@ _INSECURE_DL=${BS_INSECURE_DL:-$BS_FALSE}
_WGET_ARGS=${BS_WGET_ARGS:-}
_CURL_ARGS=${BS_CURL_ARGS:-}
_FETCH_ARGS=${BS_FETCH_ARGS:-}
_SALT_MASTER_ADDRESS="null"
# __SIMPLIFY_VERSION is mostly used in Solaris based distributions
__SIMPLIFY_VERSION=$BS_TRUE
while getopts ":hvnDc:g:k:MSNXCPFUKI" opt
while getopts ":hvnDc:g:k:MSNXCPFUKIA:" opt
do
case "${opt}" in
@ -283,6 +286,7 @@ do
U ) _UPGRADE_SYS=$BS_TRUE ;;
K ) _KEEP_TEMP_FILES=$BS_TRUE ;;
I ) _INSECURE_DL=$BS_TRUE ;;
A ) _SALT_MASTER_ADDRESS=$OPTARG ;;
\?) echo
echoerror "Option does not exist : $OPTARG"
@ -325,6 +329,13 @@ if [ $_CONFIG_ONLY -eq $BS_TRUE ] && [ "$_TEMP_CONFIG_DIR" = "null" ]; then
exit 1
fi
# Check that we're installing a minion if we're being passed a master address
if [ $_INSTALL_MINION -eq $BS_FALSE ] && [ $_SALT_MASTER_ADDRESS != "null" ]; then
echoerror "Don't pass a master address(-A) if no minion is going to be bootstrapped."
exit 1
fi
# Define installation type
if [ "$#" -eq 0 ];then
ITYPE="stable"
@ -3501,6 +3512,16 @@ if [ $_INSTALL_MINION -eq $BS_TRUE ]; then
fi
fi
# Drop the master address if passed
if [ $_SALT_MASTER_ADDRESS != "null" ]; then
[ ! -d $_SALT_ETC_DIR/minion.conf.d ] && mkdir -p $_SALT_ETC_DIR/minion.conf.d
cat <<_eof > $_SALT_ETC_DIR/minion.conf.d/master-address.conf
master: $_SALT_MASTER_ADDRESS
_eof
fi
# Run any post install function, Only execute function is not in config mode only
if [ $_CONFIG_ONLY -eq $BS_FALSE ] && [ "$POST_INSTALL_FUNC" != "null" ]; then
echoinfo "Running ${POST_INSTALL_FUNC}()"