openstack/devstack
Code Issues Proposed changes

Merge "Update docker driver to use a CirrOS image"

Browse Source
This commit is contained in:
Jenkins 2014-02-12 19:01:03 +00:00 committed by Gerrit Code Review
commit 085ec7f2c6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/nova_plugins/hypervisor-docker
View File

@ -31,8 +31,8 @@ DOCKER_UNIX_SOCKET=/var/run/docker.sock
DOCKER_PID_FILE=/var/run/docker.pid
DOCKER_REGISTRY_PORT=${DOCKER_REGISTRY_PORT:-5042}
DOCKER_IMAGE=${DOCKER_IMAGE:-busybox:latest}
DOCKER_IMAGE_NAME=busybox
DOCKER_IMAGE=${DOCKER_IMAGE:-cirros:latest}
DOCKER_IMAGE_NAME=cirros
DOCKER_REGISTRY_IMAGE=${DOCKER_REGISTRY_IMAGE:-registry:latest}
DOCKER_REGISTRY_IMAGE_NAME=registry
DOCKER_REPOSITORY_NAME=${SERVICE_HOST}:${DOCKER_REGISTRY_PORT}/${DOCKER_IMAGE_NAME}