Browse code
Set DEFAULT_IMAGE_NAME for Docker hypervisor
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
Eric Windisch authored on 2014/02/12 03:47:47Showing 2 changed files
| ... | ... |
@@ -32,7 +32,7 @@ DOCKER_PID_FILE=/var/run/docker.pid |
| 32 | 32 |
DOCKER_REGISTRY_PORT=${DOCKER_REGISTRY_PORT:-5042}
|
| 33 | 33 |
|
| 34 | 34 |
DOCKER_IMAGE=${DOCKER_IMAGE:-cirros:latest}
|
| 35 |
-DOCKER_IMAGE_NAME=cirros |
|
| 35 |
+DOCKER_IMAGE_NAME=$DEFAULT_IMAGE_NAME |
|
| 36 | 36 |
DOCKER_REGISTRY_IMAGE=${DOCKER_REGISTRY_IMAGE:-registry:latest}
|
| 37 | 37 |
DOCKER_REGISTRY_IMAGE_NAME=registry |
| 38 | 38 |
DOCKER_REPOSITORY_NAME=${SERVICE_HOST}:${DOCKER_REGISTRY_PORT}/${DOCKER_IMAGE_NAME}
|
| ... | ... |
@@ -280,6 +280,9 @@ case "$VIRT_DRIVER" in |
| 280 | 280 |
openvz) |
| 281 | 281 |
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-ubuntu-12.04-x86_64}
|
| 282 | 282 |
IMAGE_URLS=${IMAGE_URLS:-"http://download.openvz.org/template/precreated/ubuntu-12.04-x86_64.tar.gz"};;
|
| 283 |
+ docker) |
|
| 284 |
+ DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros}
|
|
| 285 |
+ IMAGE_URLS=${IMAGE_URLS:-};;
|
|
| 283 | 286 |
libvirt) |
| 284 | 287 |
case "$LIBVIRT_TYPE" in |
| 285 | 288 |
lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc |