Merge "Fixes Heat tempest issue due to hardcoded qcow2 extension"
diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst
index 8c9e658..b2a219b 100644
--- a/doc/source/contributing.rst
+++ b/doc/source/contributing.rst
@@ -5,7 +5,7 @@
DevStack uses the standard OpenStack contribution process as outlined in
`the OpenStack wiki 'How To
Contribute' <https://wiki.openstack.org/wiki/How_To_Contribute>`__. This
-means that you will need to meet the requirements of the Contribututors
+means that you will need to meet the requirements of the Contributors
License Agreement (CLA). If you have already done that for another
OpenStack project you are good to go.
diff --git a/doc/source/exerciserc.rst b/doc/source/exerciserc.rst
index f3780c3..dacae2e 100644
--- a/doc/source/exerciserc.rst
+++ b/doc/source/exerciserc.rst
@@ -3,7 +3,7 @@
==============================
``exerciserc`` is used to configure settings for the exercise scripts.
-The values shown below are the default values. Thse can all be
+The values shown below are the default values. These can all be
overridden by setting them in the ``localrc`` section.
ACTIVE\_TIMEOUT
diff --git a/doc/source/faq.rst b/doc/source/faq.rst
index f39471c..92d7945 100644
--- a/doc/source/faq.rst
+++ b/doc/source/faq.rst
@@ -123,7 +123,7 @@
[STRIKEOUT:The majority of deployments will use packages to install
OpenStack that will have distro-based packages as dependencies.
DevStack installs as many of these Python packages as possible to
- mimic the expected production environemnt.] Certain Linux
+ mimic the expected production environment.] Certain Linux
distributions have a 'lack of workaround' in their Python
configurations that installs vendor packaged Python modules and
pip-installed modules to the SAME DIRECTORY TREE. This is causing
diff --git a/doc/source/local.conf.rst b/doc/source/local.conf.rst
index b2f7557..a1ca60a 100644
--- a/doc/source/local.conf.rst
+++ b/doc/source/local.conf.rst
@@ -2,7 +2,7 @@
local.conf - User Settings
==========================
-``local.conf`` is a user-maintained setings file that is sourced in
+``local.conf`` is a user-maintained settings file that is sourced in
``stackrc``. It contains a section that replaces the historical
``localrc`` file. See the description of
:doc:`local.conf <configuration>` for more details about the mechanics
diff --git a/doc/source/openrc.rst b/doc/source/openrc.rst
index 56ff5c2..0b090c7 100644
--- a/doc/source/openrc.rst
+++ b/doc/source/openrc.rst
@@ -4,7 +4,7 @@
``openrc`` configures login credentials suitable for use with the
OpenStack command-line tools. ``openrc`` sources ``stackrc`` at the
-beginning (which in turn sources the ``localrc`` setion of
+beginning (which in turn sources the ``localrc`` section of
``local.conf``) in order to pick up ``HOST_IP`` and/or ``SERVICE_HOST``
to use in the endpoints. The values shown below are the default values.
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/functions-common b/functions-common
index 94ab347..40a0d2b 100644
--- a/functions-common
+++ b/functions-common
@@ -1578,7 +1578,7 @@
local sudo_pip="env"
else
local cmd_pip=$(get_pip_command)
- local sudo_pip="sudo"
+ local sudo_pip="sudo -H"
fi
$xtrace
diff --git a/lib/ceilometer b/lib/ceilometer
index 1f480ea..f6280d9 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -272,12 +272,12 @@
function install_redis {
if is_ubuntu; then
install_package redis-server
+ restart_service redis-server
else
# This will fail (correctly) where a redis package is unavailable
install_package redis
+ restart_service redis
fi
-
- restart_service redis
}
# install_ceilometer() - Collect source and prepare
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/infra b/lib/infra
index 57df07d..c825b4e 100644
--- a/lib/infra
+++ b/lib/infra
@@ -37,7 +37,9 @@
git_clone_by_name "pbr"
setup_lib "pbr"
else
- pip_install "pbr"
+ # Always upgrade pbr to latest version as we may have pulled it
+ # in via system packages.
+ pip_install "-U" "pbr"
fi
}
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
diff --git a/stack.sh b/stack.sh
index d97139a..605d3cc 100755
--- a/stack.sh
+++ b/stack.sh
@@ -642,8 +642,10 @@
# Queue Configuration
# Rabbit connection info
+# In multi node devstack, second node needs RABBIT_USERID, but rabbit
+# isn't enabled.
+RABBIT_USERID=${RABBIT_USERID:-stackrabbit}
if is_service_enabled rabbit; then
- RABBIT_USERID=${RABBIT_USERID:-stackrabbit}
RABBIT_HOST=${RABBIT_HOST:-$SERVICE_HOST}
read_password RABBIT_PASSWORD "ENTER A PASSWORD TO USE FOR RABBIT."
fi
diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh
index ca46533..26aae82 100755
--- a/tools/fixup_stuff.sh
+++ b/tools/fixup_stuff.sh
@@ -85,7 +85,7 @@
# Fix prettytable 0.7.2 permissions
# Don't specify --upgrade so we use the existing package if present
-pip_install 'prettytable>0.7'
+pip_install 'prettytable>=0.7'
PACKAGE_DIR=$(get_package_path prettytable)
# Only fix version 0.7.2
dir=$(echo $PACKAGE_DIR/prettytable-0.7.2*)
diff --git a/tools/install_pip.sh b/tools/install_pip.sh
index c9119ae..f30ad2b 100755
--- a/tools/install_pip.sh
+++ b/tools/install_pip.sh
@@ -68,6 +68,13 @@
}
+# Setuptools 8 implements PEP 440, and 8.0.4 adds a warning triggered any time
+# pkg_resources inspects the list of installed Python packages if there are
+# non-compliant version numbers in the egg-info (for example, from distro
+# system packaged Python libraries). This is off by default after 8.2 but can
+# be enabled by uncommenting the lines below.
+#PYTHONWARNINGS=$PYTHONWARNINGS,always::RuntimeWarning:pkg_resources
+#export PYTHONWARNINGS
# Show starting versions
get_versions
@@ -83,6 +90,6 @@
configure_pypi_alternative_url
fi
-pip_install -U "setuptools<8.0"
+pip_install -U setuptools
get_versions