diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2019-04-24 07:50:11 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2019-04-24 07:50:11 -0700 |
| commit | 7ff8c6fcc4ed9bba3a0fa9fa41ba519ab89cb11e (patch) | |
| tree | 760378000716a71163b9bc55ce575d8b40a4edb6 | |
| parent | ca2b87e4a1e01d1184b0793ea98ddd5385dec6a6 (diff) | |
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>
| -rw-r--r-- | deployment/heat/onap-rke/k8s_vm_install.sh | 8 | ||||
| -rw-r--r-- | deployment/heat/onap-rke/onap-oom.yaml | 2 | ||||
| -rw-r--r-- | deployment/heat/onap-rke/parts/onap-oom-1.yaml | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/deployment/heat/onap-rke/k8s_vm_install.sh b/deployment/heat/onap-rke/k8s_vm_install.sh index ebd4563a9..cbd7be3d9 100644 --- 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 6b9d022fe..af26bfe37 100644 --- 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 b1676b299..465485967 100644 --- 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 |