|
...
|
...
|
@@ -70,13 +70,6 @@ function configure_glanceclient() {
|
|
70
|
70
|
setup_develop $GLANCECLIENT_DIR
|
|
71
|
71
|
}
|
|
72
|
72
|
|
|
73
|
|
-# durable_glance_queues() - Determine if RabbitMQ queues are durable or not
|
|
74
|
|
-function durable_glance_queues() {
|
|
75
|
|
- test `rabbitmqctl list_queues name durable | grep true | wc -l` -gt 0 && return 0
|
|
76
|
|
- test `rabbitmqctl list_exchanges name durable | grep true | wc -l` -gt 0 && return 0
|
|
77
|
|
- return 1
|
|
78
|
|
-}
|
|
79
|
|
-
|
|
80
|
73
|
# configure_glance() - Set config files, create data dirs, etc
|
|
81
|
74
|
function configure_glance() {
|
|
82
|
75
|
setup_develop $GLANCE_DIR
|
|
...
|
...
|
@@ -127,12 +120,6 @@ function configure_glance() {
|
|
127
|
127
|
iniset $GLANCE_API_CONF DEFAULT notifier_strategy rabbit
|
|
128
|
128
|
iniset $GLANCE_API_CONF DEFAULT rabbit_host $RABBIT_HOST
|
|
129
|
129
|
iniset $GLANCE_API_CONF DEFAULT rabbit_password $RABBIT_PASSWORD
|
|
130
|
|
- if [[ durable_glance_queues -eq 0 ]]; then
|
|
131
|
|
- # This gets around https://bugs.launchpad.net/glance/+bug/1074132
|
|
132
|
|
- # that results in a g-api server becoming unresponsive during
|
|
133
|
|
- # startup...
|
|
134
|
|
- iniset $GLANCE_API_CONF DEFAULT rabbit_durable_queues True
|
|
135
|
|
- fi
|
|
136
|
130
|
fi
|
|
137
|
131
|
if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" ]]; then
|
|
138
|
132
|
iniset $GLANCE_API_CONF keystone_authtoken signing_dir $GLANCE_AUTH_CACHE_DIR/api
|