openstack/zun
Code Issues Proposed changes

Add docker-ce in check_docker and updated docker daemon with proxy configuration

Browse Source 
For devstack-plugin-container plugin, existing docker-ce checks added in zun
and kuryr-libnetwork. Update - Proxy configuration changes and
docker daemon command is deprecated since 1.12, update with dockerd command

Change-Id: Ibd5ac7f933570688523ba273e0413a0d8eae1681
Related-Bug: #1684057
This commit is contained in:
cooldharma06 2017-04-21 21:25:34 -04:00
parent 522d613fe0
commit bed9d80a4d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/lib/zun
View File

@ -117,9 +117,9 @@ function _config_zun_apache_wsgi {
function check_docker {
if is_ubuntu; then
dpkg -s docker-engine > /dev/null 2>&1
dpkg -s docker-engine > /dev/null 2>&1 || dpkg -s docker-ce > /dev/null 2>&1
else
rpm -q docker-engine > /dev/null 2>&1 || rpm -q docker > /dev/null 2>&1
rpm -q docker-engine > /dev/null 2>&1 || rpm -q docker > /dev/null 2>&1 || rpm -q docker-ce > /dev/null 2>&1
fi
}