mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-17 10:10:25 +00:00
add python2-futures to more places
This commit is contained in:
parent
4ebcded9dc
commit
c91d35bf4a
2 changed files with 5 additions and 4 deletions
|
@ -38,7 +38,7 @@ platforms:
|
|||
provision_command:
|
||||
- yum install -y upstart
|
||||
provisioner:
|
||||
salt_bootstrap_options: -MPq -y -x python2.7 -X git %s
|
||||
salt_bootstrap_options: -MPq -y -x python2.7 git %s
|
||||
- name: amazon-1
|
||||
driver_config:
|
||||
image: amazonlinux:1
|
||||
|
@ -97,6 +97,7 @@ suites:
|
|||
salt_version: 2017.7
|
||||
salt_bootstrap_options: -MP stable %s
|
||||
excludes:
|
||||
- arch
|
||||
- centos-6
|
||||
- fedora
|
||||
- opensuse
|
||||
|
|
|
@ -3099,7 +3099,7 @@ install_debian_git_deps() {
|
|||
|
||||
__PACKAGES="libzmq3 libzmq3-dev lsb-release python-apt python-backports.ssl-match-hostname"
|
||||
__PACKAGES="${__PACKAGES} python-crypto python-jinja2 python-msgpack python-m2crypto"
|
||||
__PACKAGES="${__PACKAGES} python-requests python-tornado python-yaml python-zmq"
|
||||
__PACKAGES="${__PACKAGES} python-requests python-tornado python-yaml python-zmq python-futures"
|
||||
|
||||
if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then
|
||||
# Install python-libcloud if asked to
|
||||
|
@ -4795,7 +4795,7 @@ install_arch_linux_stable() {
|
|||
pacman -S --noconfirm --needed bash || return 1
|
||||
pacman -Su --noconfirm || return 1
|
||||
# We can now resume regular salt update
|
||||
pacman -Syu --noconfirm salt || return 1
|
||||
pacman -Syu --noconfirm salt python2-futures || return 1
|
||||
return 0
|
||||
}
|
||||
|
||||
|
@ -5649,7 +5649,7 @@ install_opensuse_git_deps() {
|
|||
|
||||
__git_clone_and_checkout || return 1
|
||||
|
||||
__PACKAGES="libzmq5 python-Jinja2 python-m2crypto python-msgpack-python python-pycrypto python-pyzmq python-xml"
|
||||
__PACKAGES="libzmq5 python-Jinja2 python-m2crypto python-msgpack-python python-pycrypto python-pyzmq python-xml python-futures"
|
||||
|
||||
if [ -f "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt" ]; then
|
||||
# We're on the develop branch, install whichever tornado is on the requirements file
|
||||
|
|
Loading…
Add table
Reference in a new issue