openstack/devstack
Code Issues Proposed changes

Update docker driver to use a CirrOS image

Browse Source 
For purposes of matching the VM image used
in devstack across hypervisors, set the
default container image for Docker to cirros.

This uses the CirrOS image from stackbrew,
the "standard library" for Docker.

Change-Id: I9d767a4e06c5caa7b92ffea25e6a9aeda9bf282a
This commit is contained in:
Eric Windisch 2014-01-31 01:40:50 -05:00
parent b4b9146de2
commit 97ce935a92
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}