mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 09:40:21 +00:00
Initial pass at adding a quick start option to the bootstrap script.
This commit is contained in:
parent
77ea398385
commit
01b3886fd7
1 changed files with 31 additions and 1 deletions
|
@ -395,6 +395,8 @@ __usage() {
|
|||
resort method. NOTE: This only works for functions which actually
|
||||
implement pip based installations.
|
||||
-q Quiet salt installation from git (setup.py install -q)
|
||||
-Q Quickstart, install the Salt master and the Salt minion.
|
||||
And automatically accept the minion key.
|
||||
-R Specify a custom repository URL. Assumes the custom repository URL
|
||||
points to a repository that mirrors Salt packages located at
|
||||
repo.saltproject.io. The option passed with -R replaces the
|
||||
|
@ -426,7 +428,7 @@ EOT
|
|||
} # ---------- end of function __usage ----------
|
||||
|
||||
|
||||
while getopts ':hvnDc:g:Gyx:k:s:MSNXCPFUKIA:i:Lp:dH:bflV:J:j:rR:aq' opt
|
||||
while getopts ':hvnDc:g:Gyx:k:s:MSNXCPFUKIA:i:Lp:dH:bflV:J:j:rR:aqQ' opt
|
||||
do
|
||||
case "${opt}" in
|
||||
|
||||
|
@ -470,6 +472,7 @@ do
|
|||
J ) _CUSTOM_MASTER_CONFIG=$OPTARG ;;
|
||||
j ) _CUSTOM_MINION_CONFIG=$OPTARG ;;
|
||||
q ) _QUIET_GIT_INSTALLATION=$BS_TRUE ;;
|
||||
Q ) _QUICK_START=$BS_TRUE ;;
|
||||
x ) _PY_EXE="$OPTARG" ;;
|
||||
y ) _INSTALL_PY="$BS_TRUE" ;;
|
||||
|
||||
|
@ -600,6 +603,21 @@ if [ "$#" -gt 0 ];then
|
|||
shift
|
||||
fi
|
||||
|
||||
# Doing a quick start, so install master
|
||||
# set master address to 127.0.0.1
|
||||
if [ "$_QUICK_START" -eq "$BS_TRUE" ]; then
|
||||
# make sure we're installing the master
|
||||
_INSTALL_MASTER=$BS_TRUE
|
||||
# override incase install minion
|
||||
# is set to false
|
||||
_INSTALL_MINION=$BS_TRUE
|
||||
# Set master address to loopback IP
|
||||
_SALT_MASTER_ADDRESS="127.0.0.1"
|
||||
# Auto accept the minion key
|
||||
# when the install is done.
|
||||
_AUTO_ACCEPT_MINION_KEYS=$BS_TRUE
|
||||
fi
|
||||
|
||||
# Check installation type
|
||||
if [ "$(echo "$ITYPE" | grep -E '(stable|testing|git|onedir|onedir_rc|old-stable)')" = "" ]; then
|
||||
echoerror "Installation type \"$ITYPE\" is not known..."
|
||||
|
@ -9699,6 +9717,11 @@ if [ "$DAEMONS_RUNNING_FUNC" != "null" ] && [ ${_START_DAEMONS} -eq $BS_TRUE ];
|
|||
fi
|
||||
fi
|
||||
|
||||
if [ "$_AUTO_ACCEPT_MINION_KEYS" -eq "$BS_TRUE" ]; then
|
||||
echoinfo "Accepting the Salt Minion Keys"
|
||||
salt-key -yA
|
||||
fi
|
||||
|
||||
# Done!
|
||||
if [ "$_CONFIG_ONLY" -eq $BS_FALSE ]; then
|
||||
echoinfo "Salt installed!"
|
||||
|
@ -9706,6 +9729,13 @@ else
|
|||
echoinfo "Salt configured!"
|
||||
fi
|
||||
|
||||
if [ "$_QUICK_START" -eq "$BS_TRUE" ]; then
|
||||
echoinfo "Congratulations!"
|
||||
echoinfo "A couple of commands to try:"
|
||||
echoinfo " salt \* test.ping"
|
||||
echoinfo " salt \* test.version"
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
||||
# vim: set sts=4 ts=4 et
|
||||
|
|
Loading…
Add table
Reference in a new issue