From 5a77d03addeab27704eeeb6a43ea75c1a9941764 Mon Sep 17 00:00:00 2001 From: Sam Alba Date: Mon, 21 Oct 2013 16:17:30 -0700 Subject: [PATCH] Removed docker version requirement Change-Id: I9f04db46706bf6453def09ca1e22e0db918d811b Closes-Bug: #1237581 --- lib/nova_plugins/hypervisor-docker | 3 +-- tools/docker/install_docker.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/nova_plugins/hypervisor-docker b/lib/nova_plugins/hypervisor-docker index 427554b7db..70b1b6bdc5 100644 --- a/lib/nova_plugins/hypervisor-docker +++ b/lib/nova_plugins/hypervisor-docker @@ -37,7 +37,6 @@ DOCKER_REGISTRY_IMAGE=${DOCKER_REGISTRY_IMAGE:-http://get.docker.io/images/opens DOCKER_REGISTRY_IMAGE_NAME=docker-registry DOCKER_REPOSITORY_NAME=${SERVICE_HOST}:${DOCKER_REGISTRY_PORT}/${DOCKER_IMAGE_NAME} -DOCKER_PACKAGE_VERSION=${DOCKER_PACKAGE_VERSION:-0.6.1} DOCKER_APT_REPO=${DOCKER_APT_REPO:-https://get.docker.io/ubuntu} @@ -72,7 +71,7 @@ function install_nova_hypervisor() { fi # Make sure Docker is installed - if ! is_package_installed lxc-docker-${DOCKER_PACKAGE_VERSION}; then + if ! is_package_installed lxc-docker; 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 index 483955bfc2..2e5b510c41 100755 --- 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 socat # Start the daemon - restart just in case the package ever auto-starts... restart_service docker