From 8635b67777e3aa0c90eccdbcb5753e33a1750aeb Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Wed, 2 Sep 2020 16:04:59 +0530 Subject: [PATCH] Use SETUPTOOLS_USE_DISTUTILS=stdlib for global pip installs A new setuptools release has changed the way pip installs are done, see [0]. With this change we switch back to using the distro method for global pip installs. This patch also disables including aodh.conf sample to fix PDF build. This follows the same pattern like in https://review.opendev.org/#/c/737230/ [0] http://lists.openstack.org/pipermail/openstack-discuss/2020-August/016905.html Depends-On: https://review.opendev.org/749543 Change-Id: Ied9bf958c6b19e5a25224b7a63ef8756ecd56666 --- devstack/plugin.sh | 3 ++- doc/source/configuration/aodh-config-file.rst | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 48798b372..a770c62f1 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -244,7 +244,8 @@ function install_aodh { else PY_VERS=${PYTHON2_VERSION} fi - sudo -H python${PY_VERS} -m pip install -e "$AODH_DIR"[test,$AODH_BACKEND] + sudo -H SETUPTOOLS_USE_DISTUTILS=stdlib python${PY_VERS} -m pip \ + install -e "$AODH_DIR"[test,$AODH_BACKEND] sudo install -d -o $STACK_USER -m 755 $AODH_CONF_DIR if [ "$AODH_DEPLOY" == "mod_wsgi" ]; then diff --git a/doc/source/configuration/aodh-config-file.rst b/doc/source/configuration/aodh-config-file.rst index 5f2d6c5a9..9a1afae0e 100644 --- a/doc/source/configuration/aodh-config-file.rst +++ b/doc/source/configuration/aodh-config-file.rst @@ -11,8 +11,11 @@ can be easily created by running:: aodh-config-generator -The following is a sample Aodh configuration for adaptation and use. It is -auto-generated from Aodh when this documentation is built, and can also be -viewed in `file form <../_static/aodh.conf.sample>`_. -.. literalinclude:: ../_static/aodh.conf.sample +.. only:: html + + The following is a sample Aodh configuration for adaptation and use. + It is auto-generated from Aodh when this documentation is built, and + can also be viewed in `file form <../_static/aodh.conf.sample>`_. + + .. literalinclude:: ../_static/aodh.conf.sample