GitList

Browse code

Update docker driver to use a CirrOS image

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

Eric Windisch authored on 2014/01/31 15:40:50
Showing 1 changed files

lib/nova_plugins/hypervisor-docker

History View file @ 97ce935

@@ -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}