Let kubespray install the correct docker versions

Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I1fdfa7a47856f9122232285ed274052bf496d3d5

diff --git a/deploy/metal3-vm/ubuntu_install_requirements.sh b/deploy/metal3-vm/ubuntu_install_requirements.sh
index 5559c63..d3dede0 100755 (executable)
--- a/deploy/metal3-vm/ubuntu_install_requirements.sh
+++ b/deploy/metal3-vm/ubuntu_install_requirements.sh
@@ -104,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

diff --git a/env/metal3/01_install_package.sh b/env/metal3/01_install_package.sh
index 4d4be9f..ce5aa2f 100755 (executable)
--- a/env/metal3/01_install_package.sh
+++ b/env/metal3/01_install_package.sh
@@ -63,57 +63,9 @@ function install_ironic_packages {
     yq
 }
 
-function install_docker_packages {
-    apt-get remove docker \
-    docker-engine \
-    docker.io \
-    containerd \
-    runc
-    apt-get update
-    apt-get -y install \
-    apt-transport-https \
-    ca-certificates \
-    curl \
-    gnupg-agent \
-    software-properties-common
-    if [ "$1" != "offline" ]; then
-    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-    add-apt-repository \
-        "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
-        $(lsb_release -cs) \
-        stable"
-    apt-get update
-    fi
-    apt-get -y install docker-ce=18.06.0~ce~3-0~ubuntu
-}
-
-function install_podman_packages {
-    if [ "$1" != "offline" ]; then
-        add-apt-repository -y ppa:projectatomic/ppa
-    apt-get update
-    fi
-    apt-get -y install podman
-}
-
-function install_kubernetes_packages {
-    if [ "$1" != "offline" ]; then
-    curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
-    bash -c 'cat <<EOF >/etc/apt/sources.list.d/kubernetes.list
-deb https://apt.kubernetes.io/ kubernetes-xenial main
-EOF'
-    apt-get update
-    fi
-    apt-get install -y kubelet=1.15.0-00 kubeadm=1.15.0-00 kubectl=1.15.0-00
-    apt-mark hold kubelet kubeadm kubectl
-}
-
 install() {
     install_essential_packages
     install_ironic_packages $1
-
-    #install_docker_packages $1
-    #install_podman_packages $1
-    #install_kubernetes_packages $1
 }
 
 if [ "$#" -eq 0 ]; then

diff --git a/env/ubuntu/bootloader-env/01_bootloader_package_req.sh b/env/ubuntu/bootloader-env/01_bootloader_package_req.sh
index 737285d..39223d3 100755 (executable)
--- a/env/ubuntu/bootloader-env/01_bootloader_package_req.sh
+++ b/env/ubuntu/bootloader-env/01_bootloader_package_req.sh
@@ -192,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 {
@@ -226,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 {