diff options
| author |   Victor Morales <victor.morales@intel.com> | 2018-10-05 22:46:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-05 22:46:09 +0000 |
| commit | a0bd2be684a2f97372cdbe80a5d0ca9e0978cf92 (patch) | |
| tree | 0500d54b4efb2a0a24b486cd49b38b49b75b99f3 | |
| parent | 61677c26156c24599e0a4f68990177176ffb0f14 (diff) | |
| parent | 68ccbefa35422a9dbb19d83e096c325968ff90a3 (diff) | |
Merge "Fix installation order"
| -rwxr-xr-x | vagrant/setup.sh | 6 |
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 |