summaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
authorVictor Morales <victor.morales@intel.com>2018-10-04 09:41:12 -0700
committerVictor Morales <victor.morales@intel.com>2018-10-04 09:41:12 -0700
commit68ccbefa35422a9dbb19d83e096c325968ff90a3 (patch)
treefba4a26f5d32792dfa0537ee9104329014ed26fc /vagrant
parent373ab2024543a1d3c0d025715e80c3755995d6b5 (diff)
Fix installation order
The current order of the installation instructions in the setup.sh script causes issues in some systems, mainly because they are lacking of certain basic packages. This change includes the python packages and fix the order of execution. Change-Id: I73de55fc9d49a75953e3fbdde8290757adcadd7a Signed-off-by: Victor Morales <victor.morales@intel.com> Issue-ID: MULTICLOUD-301
Diffstat (limited to 'vagrant')
-rwxr-xr-xvagrant/setup.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/vagrant/setup.sh b/vagrant/setup.sh
index 2c4ece68..85900fda 100755
--- a/vagrant/setup.sh
+++ b/vagrant/setup.sh
@@ -61,6 +61,7 @@ packages=()
case ${ID,,} in
*suse)
INSTALLER_CMD="sudo -H -E zypper -q install -y --no-recommends"
+ packages+=(python-devel)
# Vagrant installation
if [[ "${enable_vagrant_install+x}" ]]; then
@@ -95,6 +96,7 @@ case ${ID,,} in
ubuntu|debian)
libvirt_group="libvirtd"
INSTALLER_CMD="sudo -H -E apt-get -y -q=3 install"
+ packages+=(python-dev)
# Vagrant installation
if [[ "${enable_vagrant_install+x}" ]]; then
@@ -124,6 +126,7 @@ case ${ID,,} in
PKG_MANAGER=$(which dnf || which yum)
sudo $PKG_MANAGER updateinfo
INSTALLER_CMD="sudo -H -E ${PKG_MANAGER} -q -y install"
+ packages+=(python-devel)
# Vagrant installation
if [[ "${enable_vagrant_install+x}" ]]; then
@@ -150,13 +153,12 @@ case ${ID,,} in
esac
+${INSTALLER_CMD} ${packages[@]}
if ! which pip; then
curl -sL https://bootstrap.pypa.io/get-pip.py | sudo python
fi
sudo -H pip install --upgrade pip
sudo -H pip install tox
-
-${INSTALLER_CMD} ${packages[@]}
if [[ ${http_proxy+x} ]]; then
vagrant plugin install vagrant-proxyconf
fi