aboutsummaryrefslogtreecommitdiffstats
path: root/kud/hosting_providers/vagrant
diff options
context:
space:
mode:
Diffstat (limited to 'kud/hosting_providers/vagrant')
-rwxr-xr-xkud/hosting_providers/vagrant/installer.sh14
-rwxr-xr-xkud/hosting_providers/vagrant/node.sh1
-rwxr-xr-xkud/hosting_providers/vagrant/setup.sh18
3 files changed, 19 insertions, 14 deletions
diff --git a/kud/hosting_providers/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh
index 75472913..cf6c0362 100755
--- a/kud/hosting_providers/vagrant/installer.sh
+++ b/kud/hosting_providers/vagrant/installer.sh
@@ -42,14 +42,16 @@ function _install_go {
# _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
+ sudo apt-get install -y python3 python3-pip
+ 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
+ sudo -E pip install --no-cache-dir --upgrade pip
if $(ansible --version &>/dev/null); then
- sudo pip3 uninstall -y ansible
+ sudo pip uninstall -y ansible
fi
local version=$(grep "ansible_version" ${kud_playbooks}/kud-vars.yml | awk -F ': ' '{print $2}')
sudo mkdir -p /etc/ansible/
- sudo -E pip3 install --no-cache-dir ansible==$version
+ sudo -E pip install --no-cache-dir ansible==$version
}
function _set_environment_file {
@@ -79,7 +81,7 @@ function install_k8s {
rm $tarball
pushd $dest_folder/kubespray-$version/
- sudo -E pip3 install --no-cache-dir -r ./requirements.txt
+ sudo -E pip install --no-cache-dir -r ./requirements.txt
make mitogen
popd
rm -f $kud_inventory_folder/group_vars/all.yml 2> /dev/null
@@ -204,7 +206,7 @@ function install_addons {
# install_plugin() - Install ONAP Multicloud Kubernetes plugin
function install_plugin {
echo "Installing multicloud/k8s plugin"
- sudo -E pip3 install --no-cache-dir docker-compose
+ sudo -E pip install --no-cache-dir docker-compose
sudo mkdir -p /opt/{kubeconfig,consul/config}
sudo cp $HOME/.kube/config /opt/kubeconfig/kud
diff --git a/kud/hosting_providers/vagrant/node.sh b/kud/hosting_providers/vagrant/node.sh
index a51be19b..6695d585 100755
--- a/kud/hosting_providers/vagrant/node.sh
+++ b/kud/hosting_providers/vagrant/node.sh
@@ -80,6 +80,7 @@ case ${ID,,} in
*suse)
;;
ubuntu|debian)
+ apt-get update
apt-get install -y cpu-checker
kvm-ok
;;
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