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

Merge pull request #1111 from rallytime/debian-9

Browse source 
Add Debian 9 support using official repo.saltstack.com packages
This commit is contained in:
Nicole Thomas 2017-07-07 09:33:24 -06:00 • committed by GitHub
commit 4ba1174eea
1 changed files with 54 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
bootstrap-salt.sh
View file

@ -1459,6 +1459,9 @@ __debian_codename_translation() {
"8")
DISTRO_CODENAME="jessie"
;;
"9")
DISTRO_CODENAME="stretch"
;;
*)
DISTRO_CODENAME="jessie"
;;
@ -2924,17 +2927,8 @@ install_ubuntu_check_services() {
# Debian Install Functions
#
__install_saltstack_debian_repository() {
if [ "$DISTRO_MAJOR_VERSION" -eq 9 ]; then
# Packages for Debian 9 at repo.saltstack.com are not yet available
# Set up repository for Debian 8 for Debian 9 for now until support
# is available at repo.saltstack.com for Debian 9.
DEBIAN_RELEASE="8"
else
DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION"
fi
# amd64 is just a part of repository URI, 32-bit pkgs are hosted under the same location
SALTSTACK_DEBIAN_URL="${HTTP_VAL}://${_REPO_URL}/apt/debian/${DEBIAN_RELEASE}/${__REPO_ARCH}/${STABLE_REV}"
SALTSTACK_DEBIAN_URL="${HTTP_VAL}://${_REPO_URL}/apt/debian/${DISTRO_MAJOR_VERSION}/${__REPO_ARCH}/${STABLE_REV}"
echo "deb $SALTSTACK_DEBIAN_URL $DISTRO_CODENAME main" > "/etc/apt/sources.list.d/saltstack.list"
if [ "$HTTP_VAL" = "https" ] ; then
@ -2975,6 +2969,11 @@ install_debian_deps() {
# YAML module is used for generating custom master/minion configs
__PACKAGES="${__PACKAGES} python-yaml"
# Debian 9 needs the dirmgr package in order to import the GPG key later
if [ "$DISTRO_MAJOR_VERSION" -ge 9 ]; then
__PACKAGES="${__PACKAGES} dirmngr"
fi
# shellcheck disable=SC2086
__apt_get_install_noinput ${__PACKAGES} || return 1
@ -3093,6 +3092,40 @@ install_debian_8_git_deps() {
return 0
}
install_debian_9_git_deps() {
install_debian_deps || return 1
if ! __check_command_exists git; then
__apt_get_install_noinput git || return 1
fi
if [ "$_INSECURE_DL" -eq $BS_FALSE ] && [ "${_SALT_REPO_URL%%://*}" = "https" ]; then
__apt_get_install_noinput ca-certificates
fi
__git_clone_and_checkout || return 1
__PACKAGES="libzmq5 lsb-release python-apt python-backports-abc python-crypto"
__PACKAGES="${__PACKAGES} python-jinja2 python-msgpack python-requests python-systemd"
__PACKAGES="${__PACKAGES} python-tornado python-yaml python-zmq"
if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then
# Install python-libcloud if asked to
__PACKAGES="${__PACKAGES} python-libcloud"
fi
# shellcheck disable=SC2086
__apt_get_install_noinput ${__PACKAGES} || return 1
# Let's trigger config_salt()
if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
_TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/"
CONFIG_SALT_FUNC="config_salt"
fi
return 0
}
install_debian_stable() {
__PACKAGES=""
@ -3125,9 +3158,14 @@ install_debian_8_stable() {
return 0
}
install_debian_9_stable() {
install_debian_stable || return 1
return 0
}
install_debian_git() {
if [ -f "${_SALT_GIT_CHECKOUT_DIR}/salt/syspaths.py" ]; then
python setup.py --salt-config-dir="$_SALT_ETC_DIR" --salt-cache-dir="${_SALT_CACHE_DIR}" ${SETUP_PY_INSTALL_ARGS} install --install-layout=deb || return 1
python setup.py --salt-config-dir="$_SALT_ETC_DIR" --salt-cache-dir="${_SALT_CACHE_DIR}" ${SETUP_PY_INSTALL_ARGS} install --install-layout=deb || return 1
else
python setup.py ${SETUP_PY_INSTALL_ARGS} install --install-layout=deb || return 1
fi
@ -3143,6 +3181,11 @@ install_debian_8_git() {
return 0
}
install_debian_9_git() {
install_debian_git || return 1
return 0
}
install_debian_git_post() {
for fname in api master minion syndic; do
# Skip if not meant to be installed