Merge pull request #28745 from justinsb/fix_28644

Automatic merge from submit-queue

kube-up: install new Docker pre-requisite (libltdl7) when not in image

Docker now has a dependency on libltdl7; we have to specify it manually
if we are installing docker using dpkg (vs using apt-get or similar,
which would pull it in automatically)

Fixes #28644
This commit is contained in:
k8s-merge-robot 2016-07-13 10:17:15 -07:00 committed by GitHub
commit 2906a35c1a

View File

@ -376,11 +376,15 @@ purge-old-docker-package:
- mode: 644
- makedirs: true
libltdl7:
pkg.installed
docker-upgrade:
cmd.run:
- name: /opt/kubernetes/helpers/pkg install-no-start {{ docker_pkg_name }} {{ override_docker_ver }} /var/cache/docker-install/{{ override_deb }}
- require:
- file: /var/cache/docker-install/{{ override_deb }}
- pkg: libltdl7
{% endif %} # end override_docker_ver != ''