From ec903059d5ab4c387f49f429976da9c147fab808 Mon Sep 17 00:00:00 2001 From: Mark McClain Date: Tue, 4 Dec 2012 10:32:41 -0500 Subject: [PATCH] Revert "Set the rabbit_durable_queues to match local consumers" This reverts commit 71cf53a9f60176419732f3ecbbce11c75190c059. The attempt to set the queue durability for Glance notifications always sets the queues to durable. We are reverting this until a refined approach is available. Change-Id: I469e5149d21e3fcdd409da8114d5ccef1ff1243c --- lib/glance | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/lib/glance b/lib/glance index 60026d546a..b02a4b63c8 100644 --- a/lib/glance +++ b/lib/glance @@ -70,13 +70,6 @@ function configure_glanceclient() { setup_develop $GLANCECLIENT_DIR } -# durable_glance_queues() - Determine if RabbitMQ queues are durable or not -function durable_glance_queues() { - test `rabbitmqctl list_queues name durable | grep true | wc -l` -gt 0 && return 0 - test `rabbitmqctl list_exchanges name durable | grep true | wc -l` -gt 0 && return 0 - return 1 -} - # configure_glance() - Set config files, create data dirs, etc function configure_glance() { setup_develop $GLANCE_DIR @@ -127,12 +120,6 @@ function configure_glance() { iniset $GLANCE_API_CONF DEFAULT notifier_strategy rabbit iniset $GLANCE_API_CONF DEFAULT rabbit_host $RABBIT_HOST iniset $GLANCE_API_CONF DEFAULT rabbit_password $RABBIT_PASSWORD - if [[ durable_glance_queues -eq 0 ]]; then - # This gets around https://bugs.launchpad.net/glance/+bug/1074132 - # that results in a g-api server becoming unresponsive during - # startup... - iniset $GLANCE_API_CONF DEFAULT rabbit_durable_queues True - fi fi if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" ]]; then iniset $GLANCE_API_CONF keystone_authtoken signing_dir $GLANCE_AUTH_CACHE_DIR/api