commit 5dd1778909c7c256bdef79cd236fb0d95d8a09dd
author Jenkins <jenkins@review.openstack.org> Thu Aug 14 15:11:15 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu Aug 14 15:11:15 2014 +0000
tree e1a56e589b4db7a079f3f814e30b72d08f95d86f
parent 4c99da8f237b038f104426a8bbf43e5fbd07cd41
parent 0d02924639e1ca138f2c7eee795f2d208680e7ab

Merge "Setup AMQP properly for glance-registry"

lib/glance

diff --git a/lib/glance b/lib/glance
index 92577d9..78e5e88 100644
--- a/lib/glance
+++ b/lib/glance
@@ -96,6 +96,10 @@
     iniset $GLANCE_REGISTRY_CONF keystone_authtoken admin_user glance
     iniset $GLANCE_REGISTRY_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
     iniset $GLANCE_REGISTRY_CONF keystone_authtoken signing_dir $GLANCE_AUTH_CACHE_DIR/registry
+    if is_service_enabled qpid || [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; then
+        iniset $GLANCE_REGISTRY_CONF DEFAULT notification_driver messaging
+    fi
+    iniset_rpc_backend glance $GLANCE_REGISTRY_CONF DEFAULT
 
     cp $GLANCE_DIR/etc/glance-api.conf $GLANCE_API_CONF
     iniset $GLANCE_API_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL