openstack/devstack
Code Issues Proposed changes

fix trove image addition

Browse Source 
the previous addition to trove was done in a way that it was not
possible to discover from nodepool. This fixes our ability to do
that, especially with non-default on services.

Change-Id: I8ca682354e0d4e2eb9cf05f40c6dd783de1c6355
This commit is contained in:
Sean Dague 2014-06-30 16:49:30 -04:00
parent c06c9e1f90
commit fafb62b93e
3 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/trove
View File

@ -36,7 +36,6 @@ TROVE_AUTH_CACHE_DIR=${TROVE_AUTH_CACHE_DIR:-/var/cache/trove}
TROVE_DATASTORE_TYPE=${TROVE_DATASTORE_TYPE:-"mysql"} TROVE_DATASTORE_TYPE=${TROVE_DATASTORE_TYPE:-"mysql"}
TROVE_DATASTORE_VERSION=${TROVE_DATASTORE_VERSION:-"5.5"} TROVE_DATASTORE_VERSION=${TROVE_DATASTORE_VERSION:-"5.5"}
TROVE_DATASTORE_PACKAGE=${TROVE_DATASTORE_PACKAGE:-"mysql-server-5.5"} TROVE_DATASTORE_PACKAGE=${TROVE_DATASTORE_PACKAGE:-"mysql-server-5.5"}
TROVE_GUEST_IMAGE_URL=${TROVE_GUEST_IMAGE_URL:-"http://tarballs.openstack.org/trove/images/ubuntu_mysql.qcow2/ubuntu_mysql.qcow2"}
# Support entry points installation of console scripts # Support entry points installation of console scripts
if [[ -d $TROVE_DIR/bin ]]; then if [[ -d $TROVE_DIR/bin ]]; then

17
stackrc
View File

@ -35,6 +35,8 @@ fi
# # Optional, to enable tempest configuration as part of devstack # # Optional, to enable tempest configuration as part of devstack
# enable_service tempest # enable_service tempest
# this allows us to pass ENABLED_SERVICES
if [[ -z "$ENABLED_SERVICES" ]]; then
# core compute (glance / keystone / nova (+ nova-network)) # core compute (glance / keystone / nova (+ nova-network))
ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-cond,n-sch,n-novnc,n-xvnc,n-cauth ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-cond,n-sch,n-novnc,n-xvnc,n-cauth
# cinder # cinder
@ -45,7 +47,7 @@ ENABLED_SERVICES+=,h-eng,h-api,h-api-cfn,h-api-cw
ENABLED_SERVICES+=,horizon ENABLED_SERVICES+=,horizon
# additional services # additional services
ENABLED_SERVICES+=,rabbit,tempest,mysql ENABLED_SERVICES+=,rabbit,tempest,mysql
fi
# Tell Tempest which services are available. The default is set here as # Tell Tempest which services are available. The default is set here as
# Tempest falls late in the configuration sequence. This differs from # Tempest falls late in the configuration sequence. This differs from
@ -361,6 +363,19 @@ if [[ "$ENABLED_SERVICES" =~ 'h-api' ]]; then
;; ;;
esac esac
fi fi
# Trove needs a custom image for it's work
if [[ "$ENABLED_SERVICES" =~ 'tr-api' ]]; then
case "$VIRT_DRIVER" in
libvirt|baremetal|ironic)
TROVE_GUEST_IMAGE_URL=${TROVE_GUEST_IMAGE_URL:-"http://tarballs.openstack.org/trove/images/ubuntu_mysql.qcow2/ubuntu_mysql.qcow2"}
IMAGE_URLS+=",${TROVE_GUEST_IMAGE_URL}"
;;
*)
;;
esac
fi
# Staging Area for New Images, have them here for at least 24hrs for nodepool # Staging Area for New Images, have them here for at least 24hrs for nodepool
# to cache them otherwise the failure rates in the gate are too high # to cache them otherwise the failure rates in the gate are too high
PRECACHE_IMAGES=$(trueorfalse False $PRECACHE_IMAGES) PRECACHE_IMAGES=$(trueorfalse False $PRECACHE_IMAGES)

2
tools/image_list.sh
View File

@ -10,7 +10,7 @@ source $TOP_DIR/functions
DRIVERS="openvz ironic libvirt vsphere xenserver dummy" DRIVERS="openvz ironic libvirt vsphere xenserver dummy"
# Extra variables to trigger getting additional images. # Extra variables to trigger getting additional images.
ENABLED_SERVICES=h-api export ENABLED_SERVICES="h-api,tr-api"
HEAT_FETCHED_TEST_IMAGE="Fedora-i386-20-20131211.1-sda" HEAT_FETCHED_TEST_IMAGE="Fedora-i386-20-20131211.1-sda"
PRECACHE_IMAGES=True PRECACHE_IMAGES=True