fix two bugs with docker, Bug #1237581

docker · docker · commit 3d602662ed4b · 2013-10-09T12:01:36.000-07:00
diff --git a/lib/nova_plugins/hypervisor-docker b/lib/nova_plugins/hypervisor-docker
@@ -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
 
diff --git a/tools/docker/install_docker.sh b/tools/docker/install_docker.sh
@@ -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
