From 19a3814b9a3afc24a77c5c301622661f388475d5 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Thu, 30 Jan 2014 15:49:53 +0100 Subject: [PATCH] glance: stop using deprecated notifier_strategy Change-Id: Ic796f0ad57db45bf053312ad10815461528030b3 --- lib/glance | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/glance b/lib/glance index 2d41ea4653..07c4408efc 100644 --- a/lib/glance +++ b/lib/glance @@ -108,10 +108,8 @@ function configure_glance() { 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