commit 19a3814b9a3afc24a77c5c301622661f388475d5
author Julien Danjou <julien@danjou.info> Thu Jan 30 15:49:53 2014 +0100
committer Julien Danjou <julien@danjou.info> Fri Jan 31 11:00:40 2014 +0100
tree 11da8de224f974c0450735a85ce87438716f6da5
parent 465653e25f0379891c30c5ef2eb8ed8c286f972a

glance: stop using deprecated notifier_strategy

Change-Id: Ic796f0ad57db45bf053312ad10815461528030b3

lib/glance

diff --git a/lib/glance b/lib/glance
index 2d41ea4..07c4408 100644
--- a/lib/glance
+++ b/lib/glance
@@ -108,10 +108,8 @@
     iniset $GLANCE_API_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
     iniset $GLANCE_API_CONF keystone_authtoken admin_user glance
     iniset $GLANCE_API_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
-    if is_service_enabled qpid; then
-        iniset $GLANCE_API_CONF DEFAULT notifier_strategy qpid
-    elif [ -n "$RABBIT_HOST" ] &&  [ -n "$RABBIT_PASSWORD" ]; then
-        iniset $GLANCE_API_CONF DEFAULT notifier_strategy rabbit
+    if is_service_enabled qpid || [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; then
+        iniset $GLANCE_API_CONF DEFAULT notification_driver messaging
     fi
     iniset_rpc_backend glance $GLANCE_API_CONF DEFAULT
     iniset $GLANCE_API_CONF keystone_authtoken signing_dir $GLANCE_AUTH_CACHE_DIR/api