commit e6aeb5912bec29eecd18852c75f49ddd868c62f0
author Greg Lucas <glucas@tesora.com> Wed Jul 09 13:30:38 2014 -0400
committer Greg Lucas <glucas@tesora.com> Mon Jul 28 15:22:16 2014 -0400
tree cc58c54c012ed0be5658f957a102d270c0c1b136
parent f29569db7a1de1f15b654e1db131de249143e210

Avoid uploading trove guest image twice

When creating the trove datastore, get the guest image id from glance.
The trove guest image gets uploaded along with all the other
images specified in $IMAGE_URLS. It is not necessary to upload
it again in init_trove.

Also: add xenapi case to stackrc for trove guest image

Closes-Bug: 1339818
Change-Id: I2973af27ab93182fcd674f874daba1036d767d52

stackrc

diff --git a/stackrc b/stackrc
index 6af3db7..ff6c9d2 100644
--- a/stackrc
+++ b/stackrc
@@ -384,7 +384,7 @@
 # Trove needs a custom image for it's work
 if [[ "$ENABLED_SERVICES" =~ 'tr-api' ]]; then
     case "$VIRT_DRIVER" in
-        libvirt|baremetal|ironic)
+        libvirt|baremetal|ironic|xenapi)
             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}"
             ;;