openstack/openstack-helm-infra
Code Issues Proposed changes

Remove docker.io version pin

Browse Source 
Change-Id: Id45132d8476ca931042dddc4544074e26135f9fc
Signed-off-by: Steve Wilkerson <sw5822@att.com>
This commit is contained in:
Steve Wilkerson 2019-07-08 15:13:16 -05:00 committed by Steve Wilkerson
parent 7314edc57d
commit 09366598b5
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/deploy-docker/tasks/main.yaml
View File

@ -60,7 +60,7 @@
vars: vars:
packages: packages:
deb: deb:
- docker.io=18.06.1-0ubuntu1.2~18.04.1 - docker.io
rpm: rpm:
- docker - docker

3
tools/deployment/common/005-deploy-k8s.sh
View File

@ -62,9 +62,8 @@ RELEASE_NAME=$(grep 'CODENAME' /etc/lsb-release | awk -F= '{print $2}')
sudo add-apt-repository "deb https://download.ceph.com/debian-mimic/ sudo add-apt-repository "deb https://download.ceph.com/debian-mimic/
${RELEASE_NAME} main" ${RELEASE_NAME} main"
sudo -E apt-get update sudo -E apt-get update
# NOTE(srwilkers): Pin docker version to validated docker version for k8s 1.12.2
sudo -E apt-get install -y \ sudo -E apt-get install -y \
docker.io=18.06.1-0ubuntu1.2~18.04.1 \ docker.io \
socat \ socat \
jq \ jq \
util-linux \ util-linux \