From 7e85528a2c9c6669aa0857d8b9bfaa1e698c2fbc Mon Sep 17 00:00:00 2001
From: Todd Malsbary <todd.malsbary@intel.com>
Date: Thu, 8 Jul 2021 14:04:20 -0700
Subject: Update KUD to python3

Issue-ID: MULTICLOUD-1375
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I0433a55ef2ac9caba976a267fa9e1f41d5353248
---
 kud/hosting_providers/vagrant/setup.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'kud/hosting_providers/vagrant/setup.sh')

diff --git a/kud/hosting_providers/vagrant/setup.sh b/kud/hosting_providers/vagrant/setup.sh
index 7251872a..35393e1e 100755
--- a/kud/hosting_providers/vagrant/setup.sh
+++ b/kud/hosting_providers/vagrant/setup.sh
@@ -61,7 +61,7 @@ packages=()
 case ${ID,,} in
     *suse)
     INSTALLER_CMD="sudo -H -E zypper -q install -y --no-recommends"
-    packages+=(python-devel)
+    packages+=(python-devel python-pip)
 
     # Vagrant installation
     if [[ "${enable_vagrant_install+x}" ]]; then
@@ -95,7 +95,7 @@ case ${ID,,} in
 
     ubuntu|debian)
     INSTALLER_CMD="sudo -H -E apt-get -y -q=3 install"
-    packages+=(python-dev)
+    packages+=(python3-dev python3-pip)
 
     # Vagrant installation
     if [[ "${enable_vagrant_install+x}" ]]; then
@@ -125,7 +125,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)
+    packages+=(python-devel python-pip)
 
     # Vagrant installation
     if [[ "${enable_vagrant_install+x}" ]]; then
@@ -174,11 +174,13 @@ fi
 sudo modprobe vhost_net
 
 ${INSTALLER_CMD} "${packages[@]}"
-if ! which pip; then
-    curl -sL https://bootstrap.pypa.io/pip/2.7/get-pip.py | sudo python
-else
-    sudo -H -E pip install --no-cache-dir --upgrade pip
-fi
+case ${ID,,} in
+    ubuntu|debian)
+    sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 1 --force
+    sudo update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1 --force
+    ;;
+esac
+sudo -H -E pip install --no-cache-dir --upgrade pip
 sudo -H -E pip install --no-cache-dir tox
 if [[ ${http_proxy+x} ]]; then
     vagrant plugin install vagrant-proxyconf
-- 
cgit 1.2.3-korg