openstack/devstack
Code Issues Proposed changes

Revert "Set the rabbit_durable_queues to match local consumers"

Browse Source 
This reverts commit 71cf53a9f6.

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
This commit is contained in:
Mark McClain 2012-12-04 10:32:41 -05:00
parent d5a80069d8
commit ec903059d5
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/glance
View File

@ -70,13 +70,6 @@ function configure_glanceclient() {
setup_develop $GLANCECLIENT_DIR 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 # configure_glance() - Set config files, create data dirs, etc
function configure_glance() { function configure_glance() {
setup_develop $GLANCE_DIR setup_develop $GLANCE_DIR
@ -127,12 +120,6 @@ function configure_glance() {
iniset $GLANCE_API_CONF DEFAULT notifier_strategy rabbit iniset $GLANCE_API_CONF DEFAULT notifier_strategy rabbit
iniset $GLANCE_API_CONF DEFAULT rabbit_host $RABBIT_HOST iniset $GLANCE_API_CONF DEFAULT rabbit_host $RABBIT_HOST
iniset $GLANCE_API_CONF DEFAULT rabbit_password $RABBIT_PASSWORD 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 fi
if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" ]]; then if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" ]]; then
iniset $GLANCE_API_CONF keystone_authtoken signing_dir $GLANCE_AUTH_CACHE_DIR/api iniset $GLANCE_API_CONF keystone_authtoken signing_dir $GLANCE_AUTH_CACHE_DIR/api