Merge "Adds missing rabbit_userid to trove configs"
diff --git a/files/apache-keystone.template b/files/apache-keystone.template
index 88492d3..b0cfb84 100644
--- a/files/apache-keystone.template
+++ b/files/apache-keystone.template
@@ -6,6 +6,7 @@
WSGIProcessGroup keystone-public
WSGIScriptAlias / %PUBLICWSGI%
WSGIApplicationGroup %{GLOBAL}
+ WSGIPassAuthorization On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M"
</IfVersion>
diff --git a/stackrc b/stackrc
index b154297..be27dce 100644
--- a/stackrc
+++ b/stackrc
@@ -46,7 +46,7 @@
# this allows us to pass ENABLED_SERVICES
if [[ -z "$ENABLED_SERVICES" ]]; then
# core compute (glance / keystone / nova (+ nova-network))
- ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-cond,n-sch,n-novnc,n-xvnc,n-cauth
+ ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-cond,n-sch,n-xvnc,n-cauth
# cinder
ENABLED_SERVICES+=,c-sch,c-api,c-vol
# heat
diff --git a/tools/install_pip.sh b/tools/install_pip.sh
index 55ef93e..c9119ae 100755
--- a/tools/install_pip.sh
+++ b/tools/install_pip.sh
@@ -83,6 +83,6 @@
configure_pypi_alternative_url
fi
-pip_install -U setuptools
+pip_install -U "setuptools<8.0"
get_versions