openstack/devstack
Code Issues Proposed changes

Merge "Fix bugs for installing docker, bug #1237581. -The change in install_docker.sh corrects a typo ('=' should be '-'). This typo resutls in 'unable to locate the packet' error when executing apt-get."

Browse Source
This commit is contained in:
Jenkins
2013-10-22 12:40:12 +00:00
committed by Gerrit Code Review
parent 334e46997e fdc9ae8b9e
commit 1e76a02460
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nova_plugins/hypervisor-docker
View File

@@ -72,7 +72,7 @@ function install_nova_hypervisor() {
fi
# Make sure Docker is installed
if ! is_package_installed lxc-docker; then
if ! is_package_installed lxc-docker-${DOCKER_PACKAGE_VERSION}; then
die $LINENO "Docker is not installed. Please run tools/docker/install_docker.sh"
fi

2
tools/docker/install_docker.sh
View File

@@ -38,7 +38,7 @@ curl https://get.docker.io/gpg | sudo apt-key add -
install_package python-software-properties && \
sudo sh -c "echo deb $DOCKER_APT_REPO docker main > /etc/apt/sources.list.d/docker.list"
apt_get update
install_package --force-yes lxc-docker=${DOCKER_PACKAGE_VERSION} socat
install_package --force-yes lxc-docker-${DOCKER_PACKAGE_VERSION} socat
# Start the daemon - restart just in case the package ever auto-starts...
restart_service docker