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

Ensure python-apt is installed by the bootstrap script for Debian & Ubuntu minions.

Browse source
This commit is contained in:
Gareth J. Greenaway 2014-07-31 13:40:51 -07:00
parent bbd1d5b832
commit d4c5e4496b
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bootstrap-salt.sh
View file

@ -1648,6 +1648,9 @@ install_ubuntu_deps() {
# Minimal systems might not have upstart installed, install it
__apt_get_install_noinput upstart
# Need python-apt for managing packages via Salt
__apt_get_install_noinput python-apt
if [ "$DISTRO_MAJOR_VERSION" -gt 12 ] || ([ "$DISTRO_MAJOR_VERSION" -eq 12 ] && [ "$DISTRO_MINOR_VERSION" -gt 03 ]); then
__apt_get_install_noinput python-requests
__PIP_PACKAGES=""
@ -1980,6 +1983,9 @@ _eof
# Additionally install procps and pciutils which allows for Docker boostraps. See 366#issuecomment-39666813
__apt_get_install_noinput python-requests python-pip procps pciutils
# Need python-apt for managing packages via Salt
__apt_get_install_noinput python-apt
if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then
check_pip_allowed "You need to allow pip based installations (-P) in order to install apache-libcloud"
__apt_get_install_noinput python-pip
@ -2047,14 +2053,14 @@ _eof
apt-get update
__apt_get_install_noinput -t unstable libzmq3 libzmq3-dev || return 1
__PACKAGES="build-essential python-dev python-pip python-requests"
__PACKAGES="build-essential python-dev python-pip python-requests python-apt"
# Additionally install procps and pciutils which allows for Docker boostraps. See 366#issuecomment-39666813
__PACKAGES="${__PACKAGES} procps pciutils"
# shellcheck disable=SC2086
__apt_get_install_noinput ${__PACKAGES} || return 1
else
apt-get update || return 1
__PACKAGES="python-zmq python-requests"
__PACKAGES="python-zmq python-requests python-apt"
# Additionally install procps and pciutils which allows for Docker boostraps. See 366#issuecomment-39666813
__PACKAGES="${__PACKAGES} procps pciutils"
# shellcheck disable=SC2086