mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 01:30:21 +00:00
moving the logic for quickstart down to ensure install type and install revision are set correctly for quickstart.
This commit is contained in:
parent
01b3886fd7
commit
0f636544eb
2 changed files with 29 additions and 15 deletions
|
@ -603,21 +603,6 @@ 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..."
|
||||
|
@ -733,6 +718,31 @@ elif [ "$ITYPE" = "onedir_rc" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
# Doing a quick start, so install master
|
||||
# set master address to 127.0.0.1
|
||||
if [ "$_QUICK_START" -eq "$BS_TRUE" ]; then
|
||||
# make install type is stable
|
||||
ITYPE="stable"
|
||||
|
||||
# make sure the revision is latest
|
||||
STABLE_REV="latest"
|
||||
ONEDIR_REV="latest"
|
||||
|
||||
# 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 for any unparsed arguments. Should be an error.
|
||||
if [ "$#" -gt 0 ]; then
|
||||
__usage
|
||||
|
|
|
@ -397,6 +397,10 @@ suites:
|
|||
- opensuse-tumbleweed
|
||||
- ubuntu-1804
|
||||
|
||||
- name: quickstart
|
||||
provisioner:
|
||||
salt_bootstrap_options: -Q
|
||||
|
||||
verifier:
|
||||
name: shell
|
||||
remote_exec: false
|
||||
|
|
Loading…
Add table
Reference in a new issue