openstack
/
aodh
Code Issues Proposed changes

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
This commit is contained in:
Rabi Mishra 2020-09-02 16:04:59 +05:30 committed by Matthias Runge
parent 932b1e0e61
commit 8635b67777
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/plugin.sh
View File

@ -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

11
doc/source/configuration/aodh-config-file.rst
View File

@ -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