Let kubespray install the correct docker versions

[icn.git] / env / ubuntu / bootloader-env / 01_bootloader_package_req.sh

diff --git a/env/ubuntu/bootloader-env/01_bootloader_package_req.sh b/env/ubuntu/bootloader-env/01_bootloader_package_req.sh
index da4165d..39223d3 100755 (executable)
--- a/env/ubuntu/bootloader-env/01_bootloader_package_req.sh
+++ b/env/ubuntu/bootloader-env/01_bootloader_package_req.sh
@@ -18,9 +18,11 @@ fi
 function download_essential_packages {
     apt-get update
     for package in crudini curl dnsmasq figlet golang nmap patch psmisc \
-        python-pip python-requests python-setuptools vim wget; do
+        python3-pip python3-requests python3-setuptools vim wget; do
         apt-get -d install $package -y
     done
+    update-alternatives --install /usr/bin/python python /usr/bin/python3 1
+    update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1
 }
 
 function build_baremetal_operator_images {
@@ -137,8 +139,9 @@ function download_build_packages {
 
 function check_pip {
     if ! which pip ; then
-    apt-get install python-pip -y
+        apt-get install python3-pip -y
     fi
+    update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1
 }
 
 function check_curl {
@@ -154,9 +157,9 @@ function check_apt_tools {
 }
 
 function download_ironic_packages {
-    for package in jq nodejs python-ironicclient \
-        python-ironic-inspector-client python-lxml python-netaddr \
-        python-openstackclient unzip genisoimage; do
+    for package in jq nodejs python3-ironicclient \
+        python3-ironic-inspector-client python3-lxml python3-netaddr \
+        python3-openstackclient unzip genisoimage; do
         apt-get -d install $package -y
     done
 
@@ -189,7 +192,7 @@ function check_docker {
         $(lsb_release -cs) \
         stable"
     apt-get update
-    apt-get install docker-ce=18.06.0~ce~3-0~ubuntu -y
+    apt-get install docker-ce=19.03.15~3-0~ubuntu-bionic -y
 }
 
 function check_podman {
@@ -223,7 +226,7 @@ function download_docker_packages {
         $(lsb_release -cs) \
         stable"
     apt-get update
-    apt-get -d install docker-ce=18.06.0~ce~3-0~ubuntu -y
+    apt-get -d install docker-ce=19.03.15~3-0~ubuntu-bionic -y
 }
 
 function download_podman_packages {