openstack/devstack
Code Issues Proposed changes

Set DEFAULT_IMAGE_NAME for Docker hypervisor

Browse Source 
This allows the tempest configuration to set the right
image for booting docker containers with Nova.

Since glance uploads are not yet integrated in devstack,
IMAGE_URLS remains empty.

Change-Id: I5df153cd1d5e1411bb3c11816122ce280148e129
This commit is contained in:
Eric Windisch 2014-02-11 11:47:47 -07:00
parent 97ce935a92
commit 3f918a4541
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nova_plugins/hypervisor-docker
View File

@ -32,7 +32,7 @@ DOCKER_PID_FILE=/var/run/docker.pid
DOCKER_REGISTRY_PORT=${DOCKER_REGISTRY_PORT:-5042} DOCKER_REGISTRY_PORT=${DOCKER_REGISTRY_PORT:-5042}
DOCKER_IMAGE=${DOCKER_IMAGE:-cirros:latest} DOCKER_IMAGE=${DOCKER_IMAGE:-cirros:latest}
DOCKER_IMAGE_NAME=cirros DOCKER_IMAGE_NAME=$DEFAULT_IMAGE_NAME
DOCKER_REGISTRY_IMAGE=${DOCKER_REGISTRY_IMAGE:-registry:latest} DOCKER_REGISTRY_IMAGE=${DOCKER_REGISTRY_IMAGE:-registry:latest}
DOCKER_REGISTRY_IMAGE_NAME=registry DOCKER_REGISTRY_IMAGE_NAME=registry
DOCKER_REPOSITORY_NAME=${SERVICE_HOST}:${DOCKER_REGISTRY_PORT}/${DOCKER_IMAGE_NAME} DOCKER_REPOSITORY_NAME=${SERVICE_HOST}:${DOCKER_REGISTRY_PORT}/${DOCKER_IMAGE_NAME}

3
stackrc
View File

@ -280,6 +280,9 @@ case "$VIRT_DRIVER" in
openvz) openvz)
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-ubuntu-12.04-x86_64} DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-ubuntu-12.04-x86_64}
IMAGE_URLS=${IMAGE_URLS:-"http://download.openvz.org/template/precreated/ubuntu-12.04-x86_64.tar.gz"};; IMAGE_URLS=${IMAGE_URLS:-"http://download.openvz.org/template/precreated/ubuntu-12.04-x86_64.tar.gz"};;
docker)
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros}
IMAGE_URLS=${IMAGE_URLS:-};;
libvirt) libvirt)
case "$LIBVIRT_TYPE" in case "$LIBVIRT_TYPE" in
lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc