aboutsummaryrefslogtreecommitdiffstats
path: root/kud/hosting_providers/vagrant
diff options
context:
space:
mode:
authorTodd Malsbary <todd.malsbary@intel.com>2021-06-25 16:42:58 -0700
committerTodd Malsbary <todd.malsbary@intel.com>2021-06-28 16:03:39 -0700
commit8a1044af95fe1670a2d0b3d3165f54122bc19d03 (patch)
tree73130c616f385889fa1740c1d802ee2002a21523 /kud/hosting_providers/vagrant
parent557f5bcc259ca066edf6850b8cca4060703c9c3f (diff)
Update python version used in KUD installers to python3
A dependency of kubespray-2.14 now requires python3. Specifically, ruamel.yaml now fetches ruamel.yaml.clib-0.2.4 whereas it used to fetch ruamel.yaml.clib-0.2.2. The 0.2.4 requires python 3.5 or greater. Issue-ID: MULTICLOUD-1369 Signed-off-by: Todd Malsbary <todd.malsbary@intel.com> Change-Id: Ia362d5adfbe6e08750b493dbceea17df640f26ed
Diffstat (limited to 'kud/hosting_providers/vagrant')
-rwxr-xr-xkud/hosting_providers/vagrant/installer.sh21
1 files changed, 6 insertions, 15 deletions
diff --git a/kud/hosting_providers/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh
index 8c8ff7f3..5535c31b 100755
--- a/kud/hosting_providers/vagrant/installer.sh
+++ b/kud/hosting_providers/vagrant/installer.sh
@@ -40,25 +40,16 @@ function _install_go {
sudo sed -i 's|secure_path="\([^"]\+\)"|secure_path="\1:/usr/local/go/bin"|' /etc/sudoers
}
-# _install_pip() - Install Python Package Manager
-function _install_pip {
- if $(pip --version &>/dev/null); then
- sudo -E pip install --no-cache-dir --upgrade pip
- else
- sudo apt-get install -y python-dev
- curl -sL https://bootstrap.pypa.io/pip/2.7/get-pip.py | sudo python
- fi
-}
-
# _install_ansible() - Install and Configure Ansible program
function _install_ansible {
+ sudo apt-get install -y python3-pip
+ sudo -E pip3 install --no-cache-dir --upgrade pip
if $(ansible --version &>/dev/null); then
- sudo pip uninstall -y ansible
+ sudo pip3 uninstall -y ansible
fi
- _install_pip
local version=$(grep "ansible_version" ${kud_playbooks}/kud-vars.yml | awk -F ': ' '{print $2}')
sudo mkdir -p /etc/ansible/
- sudo -E pip install --no-cache-dir ansible==$version
+ sudo -E pip3 install --no-cache-dir ansible==$version
}
function _set_environment_file {
@@ -88,7 +79,7 @@ function install_k8s {
rm $tarball
pushd $dest_folder/kubespray-$version/
- sudo -E pip install --no-cache-dir -r ./requirements.txt
+ sudo -E pip3 install --no-cache-dir -r ./requirements.txt
make mitogen
popd
rm -f $kud_inventory_folder/group_vars/all.yml 2> /dev/null
@@ -213,7 +204,7 @@ function install_addons {
# install_plugin() - Install ONAP Multicloud Kubernetes plugin
function install_plugin {
echo "Installing multicloud/k8s plugin"
- sudo -E pip install --no-cache-dir docker-compose
+ sudo -E pip3 install --no-cache-dir docker-compose
sudo mkdir -p /opt/{kubeconfig,consul/config}
sudo cp $HOME/.kube/config /opt/kubeconfig/kud