Lock down docker install to 18.09.5

Change-Id: I7bf2801e7b31024d9cdb1b45a95e5ac2fd8248de
Issue-ID: OOM-1598
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/deployment/heat/onap-rke/k8s_vm_install.sh b/deployment/heat/onap-rke/k8s_vm_install.sh
index ebd4563..cbd7be3 100644 (file)
--- a/deployment/heat/onap-rke/k8s_vm_install.sh
+++ b/deployment/heat/onap-rke/k8s_vm_install.sh
@@ -50,7 +50,13 @@ sed -i 's|http://archive.ubuntu.com|http://nova.clouds.archive.ubuntu.com|g' /et
 while ! hash jq &> /dev/null; do
     apt-get -y update
     # apt-get -y dist-upgrade
-    apt-get -y install curl jq nfs-common docker.io
+    apt-get -y install curl jq nfs-common
+    sleep 10
+done
+
+# install docker
+while ! hash docker &> /dev/null; do
+    curl https://releases.rancher.com/install-docker/__docker_version__.sh | sh
     systemctl enable docker
     usermod -aG docker ubuntu
     sleep 10

diff --git a/deployment/heat/onap-rke/onap-oom.yaml b/deployment/heat/onap-rke/onap-oom.yaml
index 6b9d022..af26bfe 100644 (file)
--- a/deployment/heat/onap-rke/onap-oom.yaml
+++ b/deployment/heat/onap-rke/onap-oom.yaml
@@ -69,7 +69,7 @@ parameters:
 
   docker_version:
     type: string
-    default: "17.03.2"
+    default: "18.09.5"
 
   rancher_version:
     type: string

diff --git a/deployment/heat/onap-rke/parts/onap-oom-1.yaml b/deployment/heat/onap-rke/parts/onap-oom-1.yaml
index b1676b2..4654859 100644 (file)
--- a/deployment/heat/onap-rke/parts/onap-oom-1.yaml
+++ b/deployment/heat/onap-rke/parts/onap-oom-1.yaml
@@ -66,7 +66,7 @@ parameters:
 
   docker_version:
     type: string
-    default: "17.03.2"
+    default: "18.09.5"
 
   rancher_version:
     type: string