openstack/devstack
Code Issues Proposed changes

Merge "Removed docker version requirement"

Browse Source
This commit is contained in:
Jenkins 2013-10-31 14:22:37 +00:00 committed by Gerrit Code Review
commit 7890b4ea08
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/nova_plugins/hypervisor-docker
View File

@ -38,7 +38,6 @@ DOCKER_REGISTRY_IMAGE=${DOCKER_REGISTRY_IMAGE:-http://get.docker.io/images/opens
DOCKER_REGISTRY_IMAGE_NAME=docker-registry DOCKER_REGISTRY_IMAGE_NAME=docker-registry
DOCKER_REPOSITORY_NAME=${SERVICE_HOST}:${DOCKER_REGISTRY_PORT}/${DOCKER_IMAGE_NAME} 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} DOCKER_APT_REPO=${DOCKER_APT_REPO:-https://get.docker.io/ubuntu}
@ -69,7 +68,7 @@ function install_nova_hypervisor() {
fi fi
# Make sure Docker is installed # 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" die $LINENO "Docker is not installed. Please run tools/docker/install_docker.sh"
fi 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 && \ install_package python-software-properties && \
sudo sh -c "echo deb $DOCKER_APT_REPO docker main > /etc/apt/sources.list.d/docker.list" sudo sh -c "echo deb $DOCKER_APT_REPO docker main > /etc/apt/sources.list.d/docker.list"
apt_get update 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... # Start the daemon - restart just in case the package ever auto-starts...
restart_service docker restart_service docker