Merge "Add is_ubuntu function"
diff --git a/lib/glance b/lib/glance
index 60026d5..b02a4b6 100644
--- a/lib/glance
+++ b/lib/glance
@@ -70,13 +70,6 @@
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 @@
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
diff --git a/lib/horizon b/lib/horizon
index d0a0f05..7321cbc 100644
--- a/lib/horizon
+++ b/lib/horizon
@@ -29,10 +29,10 @@
# Set up default directories
HORIZON_DIR=$DEST/horizon
-# Allow overriding the default Apache user and group, default both to
-# current user.
+# Allow overriding the default Apache user and group, default to
+# current user and his default group.
APACHE_USER=${APACHE_USER:-$USER}
-APACHE_GROUP=${APACHE_GROUP:-$APACHE_USER}
+APACHE_GROUP=${APACHE_GROUP:-$(id -gn $APACHE_USER)}
# Entry Points