From: wrider <lji@research.att.com>
Date: Fri, 23 Aug 2019 04:51:58 +0000 (-0400)
Subject: Allow docker default version (no specific version) install
X-Git-Tag: 0.0.2~29^2
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=3d8a50eba8a02f6eeef1ed64ed82215bf8d8a349;p=it%2Fdep.git

Allow docker default version (no specific version) install

Change-Id: I42664af26c1180e2ff41ed40a00736c39da57e8b
Signed-off-by: wrider <lji@research.att.com>
---

diff --git a/ric-infra/00-Kubernetes/etc/infra.rc b/ric-infra/00-Kubernetes/etc/infra.rc
index 2678776e..81c20e7e 100644
--- a/ric-infra/00-Kubernetes/etc/infra.rc
+++ b/ric-infra/00-Kubernetes/etc/infra.rc
@@ -1,5 +1,5 @@
 # modify below for RIC infrastructure (docker-k8s-helm) component versions
-INFRA_DOCKER_VERSION="18.09.7-0ubuntu1~16.04.4"
+INFRA_DOCKER_VERSION=""
 INFRA_K8S_VERSION="1.13.3"
 INFRA_CNI_VERSION="0.6.0"
 INFRA_HELM_VERSION="2.12.3"
diff --git a/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh b/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh
index 25550a1b..deb33e52 100644
--- a/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh
+++ b/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh
@@ -125,6 +125,10 @@ DOCKERVERSION="${DOCKERV}"
 curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
 echo 'deb http://apt.kubernetes.io/ kubernetes-xenial main' > /etc/apt/sources.list.d/kubernetes.list
 
+# tell apt to retry 3 times if failed
+mkdir -p /etc/apt/apt.conf.d
+echo "APT::Acquire::Retries \"3\";" > /etc/apt/apt.conf.d/80-retries
+
 # install low latency kernel, docker.io, and kubernetes
 apt-get update
 apt-get install -y virt-what
@@ -133,7 +137,11 @@ if ! echo $(virt-what) | grep "virtualbox"; then
   # install if identifying the VM not being a virtualbox VM.
   apt-get install -y linux-image-4.15.0-45-lowlatency
 fi
-apt-get install -y curl jq netcat docker.io=${DOCKERVERSION}
+if [ -z ${DOCKERVERSION} ]; then
+  apt-get install -y curl jq netcat docker.io
+else
+  apt-get install -y curl jq netcat docker.io=${DOCKERVERSION}
+fi
 apt-get install -y kubernetes-cni=${CNIVERSION}
 apt-get install -y --allow-unauthenticated kubeadm=${KUBEVERSION} kubelet=${KUBEVERSION} kubectl=${KUBEVERSION}
 apt-mark hold docker.io kubernetes-cni kubelet kubeadm kubectl