Merge "Fix rabbit_userid for multi node devstack"
diff --git a/files/apache-keystone.template b/files/apache-keystone.template
index b0cfb84..2190d83 100644
--- a/files/apache-keystone.template
+++ b/files/apache-keystone.template
@@ -22,6 +22,7 @@
WSGIProcessGroup keystone-admin
WSGIScriptAlias / %ADMINWSGI%
WSGIApplicationGroup %{GLOBAL}
+ WSGIPassAuthorization On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M"
</IfVersion>
diff --git a/files/debs/horizon b/files/debs/horizon
index 5d06928..f9b7d59 100644
--- a/files/debs/horizon
+++ b/files/debs/horizon
@@ -12,7 +12,6 @@
pylint
python-eventlet
python-nose
-python-sphinx
python-mox
python-coverage
python-cherrypy3 # why?
diff --git a/files/debs/ryu b/files/debs/ryu
index 9b85080..354c1b7 100644
--- a/files/debs/ryu
+++ b/files/debs/ryu
@@ -1,2 +1 @@
python-eventlet
-python-sphinx
diff --git a/files/rpms-suse/horizon b/files/rpms-suse/horizon
index fa7e439..d1f378a 100644
--- a/files/rpms-suse/horizon
+++ b/files/rpms-suse/horizon
@@ -4,7 +4,6 @@
python-Paste
python-PasteDeploy
python-Routes
-python-Sphinx
python-SQLAlchemy
python-WebOb
python-anyjson
diff --git a/files/rpms-suse/ryu b/files/rpms-suse/ryu
index 6b426fb..354c1b7 100644
--- a/files/rpms-suse/ryu
+++ b/files/rpms-suse/ryu
@@ -1,2 +1 @@
-python-Sphinx
python-eventlet
diff --git a/files/rpms/horizon b/files/rpms/horizon
index 1d06ac2..82385ed 100644
--- a/files/rpms/horizon
+++ b/files/rpms/horizon
@@ -15,7 +15,6 @@
python-paste #dist:f19,f20,f21
python-paste-deploy #dist:f19,f20,f21
python-routes
-python-sphinx
python-sqlalchemy
python-webob
pyxattr
diff --git a/files/rpms/ryu b/files/rpms/ryu
index 9b85080..354c1b7 100644
--- a/files/rpms/ryu
+++ b/files/rpms/ryu
@@ -1,2 +1 @@
python-eventlet
-python-sphinx
diff --git a/lib/horizon b/lib/horizon
index 3f3b1ca..edb95e9 100644
--- a/lib/horizon
+++ b/lib/horizon
@@ -105,9 +105,6 @@
_horizon_config_set $local_settings "" OPENSTACK_HOST \"${KEYSTONE_SERVICE_HOST}\"
_horizon_config_set $local_settings "" OPENSTACK_KEYSTONE_URL "\"${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:${KEYSTONE_SERVICE_PORT}/v2.0\""
- if [[ -n "$KEYSTONE_TOKEN_HASH_ALGORITHM" ]]; then
- _horizon_config_set $local_settings "" OPENSTACK_TOKEN_HASH_ALGORITHM \""$KEYSTONE_TOKEN_HASH_ALGORITHM"\"
- fi
if [ -f $SSL_BUNDLE_FILE ]; then
_horizon_config_set $local_settings "" OPENSTACK_SSL_CACERT \"${SSL_BUNDLE_FILE}\"
diff --git a/lib/keystone b/lib/keystone
index 9c0b013..071dc90 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -318,10 +318,6 @@
iniset $KEYSTONE_CONF DEFAULT admin_workers "$API_WORKERS"
# Public workers will use the server default, typically number of CPU.
-
- if [[ -n "$KEYSTONE_TOKEN_HASH_ALGORITHM" ]]; then
- iniset $KEYSTONE_CONF token hash_algorithm "$KEYSTONE_TOKEN_HASH_ALGORITHM"
- fi
}
function configure_keystone_extensions {
@@ -443,9 +439,6 @@
iniset $conf_file $section admin_user $admin_user
iniset $conf_file $section admin_password $SERVICE_PASSWORD
iniset $conf_file $section signing_dir $signing_dir
- if [[ -n "$KEYSTONE_TOKEN_HASH_ALGORITHM" ]]; then
- iniset $conf_file keystone_authtoken hash_algorithms "$KEYSTONE_TOKEN_HASH_ALGORITHM"
- fi
}
# init_keystone() - Initialize databases, etc.
diff --git a/lib/rpc_backend b/lib/rpc_backend
index 6afec37..400204a 100644
--- a/lib/rpc_backend
+++ b/lib/rpc_backend
@@ -176,17 +176,31 @@
echo_summary "Starting RabbitMQ"
# NOTE(bnemec): Retry initial rabbitmq configuration to deal with
# the fact that sometimes it fails to start properly.
- # Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1059028
+ # Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1144100
local i
for i in `seq 10`; do
+ local rc=0
+
+ [[ $i -eq "10" ]] && die $LINENO "Failed to set rabbitmq password"
+
if is_fedora || is_suse; then
# service is not started by default
restart_service rabbitmq-server
fi
- rabbit_setuser "$RABBIT_USERID" "$RABBIT_PASSWORD"
+
+ rabbit_setuser "$RABBIT_USERID" "$RABBIT_PASSWORD" || rc=$?
+ if [ $rc -ne 0 ]; then
+ continue
+ fi
+
# change the rabbit password since the default is "guest"
- sudo rabbitmqctl change_password $RABBIT_USERID $RABBIT_PASSWORD && break
- [[ $i -eq "10" ]] && die $LINENO "Failed to set rabbitmq password"
+ sudo rabbitmqctl change_password \
+ $RABBIT_USERID $RABBIT_PASSWORD || rc=$?
+ if [ $rc -ne 0 ]; then
+ continue;
+ fi
+
+ break
done
if is_service_enabled n-cell; then
# Add partitioned access for the child cell
diff --git a/lib/swift b/lib/swift
index 41f9e84..e9043b3 100644
--- a/lib/swift
+++ b/lib/swift
@@ -132,7 +132,7 @@
# Tell Tempest this project is present
TEMPEST_SERVICES+=,swift
-# Toggle for deploying Keystone under HTTPD + mod_wsgi
+# Toggle for deploying Swift under HTTPD + mod_wsgi
SWIFT_USE_MOD_WSGI=${SWIFT_USE_MOD_WSGI:-False}
# Functions
diff --git a/lib/trove b/lib/trove
index 4149b0d..8b7b0ef 100644
--- a/lib/trove
+++ b/lib/trove
@@ -146,7 +146,7 @@
if is_service_enabled tr-tmgr; then
TROVE_AUTH_ENDPOINT=$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION
- iniset $TROVE_CONF_DIR/trove.conf DEFAULT rabbit_userid $RABBIT_USERID
+ iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT rabbit_userid $RABBIT_USERID
iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT rabbit_password $RABBIT_PASSWORD
iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT sql_connection `database_connection_url trove`
iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT taskmanager_manager trove.taskmanager.manager.Manager
@@ -159,7 +159,7 @@
# (Re)create trove conductor conf file if needed
if is_service_enabled tr-cond; then
- iniset $TROVE_CONF_DIR/trove.conf DEFAULT rabbit_userid $RABBIT_USERID
+ iniset $TROVE_CONF_DIR/trove-conductor.conf DEFAULT rabbit_userid $RABBIT_USERID
iniset $TROVE_CONF_DIR/trove-conductor.conf DEFAULT rabbit_password $RABBIT_PASSWORD
iniset $TROVE_CONF_DIR/trove-conductor.conf DEFAULT sql_connection `database_connection_url trove`
iniset $TROVE_CONF_DIR/trove-conductor.conf DEFAULT nova_proxy_admin_user radmin
@@ -171,7 +171,7 @@
fi
# Set up Guest Agent conf
- iniset $TROVE_CONF_DIR/trove.conf DEFAULT rabbit_userid $RABBIT_USERID
+ iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT rabbit_userid $RABBIT_USERID
iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT rabbit_host $TROVE_HOST_GATEWAY
iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT rabbit_password $RABBIT_PASSWORD
iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT nova_proxy_admin_user radmin