Let kubespray install the correct docker versions

[icn.git] / deploy / metal3-vm / ubuntu_install_requirements.sh

diff --git a/deploy/metal3-vm/ubuntu_install_requirements.sh b/deploy/metal3-vm/ubuntu_install_requirements.sh
index 503813a..d3dede0 100755 (executable)
--- a/deploy/metal3-vm/ubuntu_install_requirements.sh
+++ b/deploy/metal3-vm/ubuntu_install_requirements.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -ex
+set -eux -o pipefail
 
 # shellcheck disable=SC1091
 source lib/logging.sh
@@ -42,10 +42,11 @@ sudo apt -y install \
   nmap \
   patch \
   psmisc \
-  python-pip \
+  python3-pip \
   wget
 
-
+sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 1
+sudo update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1
 
 # Install pyenv
 
@@ -70,9 +71,6 @@ if [[ $PATH != *pyenv* ]]; then
   fi
 fi
 
-pyenv install -s 2.7.5
-pyenv versions
-pyenv global 2.7.5
 # There are some packages which are newer in the tripleo repos
 
 # Setup yarn and nodejs repositories
@@ -98,10 +96,7 @@ sudo apt -y install \
   nodejs \
   qemu-kvm \
   libvirt-bin libvirt-clients libvirt-dev \
-  python-ironicclient \
-  python-ironic-inspector-client \
   golang-go \
-  python-lxml \
   unzip \
   yarn \
   genisoimage
@@ -109,20 +104,6 @@ sudo apt -y install \
 
 if [[ "${CONTAINER_RUNTIME}" == "podman" ]]; then
   sudo apt -y install podman
-else
-  sudo apt -y install \
-    apt-transport-https \
-    ca-certificates \
-    gnupg-agent \
-    software-properties-common
-  curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-  sudo add-apt-repository \
-    "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
-    $(lsb_release -cs) \
-    stable"
-  sudo apt update
-  sudo apt install -y docker-ce docker-ce-cli containerd.io
-  sudo systemctl start docker
 fi
 
 # Install python packages not included as rpms