openstack
/
aodh
Code Issues Proposed changes

Merge "install aodhclient instead of ceilometerclient"

This commit is contained in:
Jenkins 2016-04-23 08:25:23 +00:00 committed by Gerrit Code Review
parent aed9a3d882 450bdc1b84
commit b502a4e50e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/plugin.sh
View File

@ -304,13 +304,13 @@ function install_aodh {
# install_aodhclient() - Collect source and prepare
function install_aodhclient {
if use_library_from_git "python-ceilometerclient"; then
git_clone_by_name "python-ceilometerclient"
setup_dev_lib "python-ceilometerclient"
sudo install -D -m 0644 -o $STACK_USER {${GITDIR["python-ceilometerclient"]}/tools/,/etc/bash_completion.d/}ceilometer.bash_completion
if use_library_from_git "python-aodhclient"; then
git_clone_by_name "python-aodhclient"
setup_dev_lib "python-aodhclient"
else
pip_install_gr python-ceilometerclient
pip_install_gr aodhclient
fi
aodh complete | sudo tee /etc/bash_completion.d/aodh.bash_completion > /dev/null
}
# start_aodh() - Start running processes, including screen

4
devstack/settings
View File

@ -36,8 +36,8 @@ AODH_COORDINATION_URL=${AODH_COORDINATION_URL:-}
# Tell Tempest this project is present
TEMPEST_SERVICES+=,aodh
# Set up default directories for client and middleware
GITDIR["python-ceilometerclient"]=$DEST/python-ceilometerclient
# Set up default directories for client
GITDIR["python-aodhclient"]=$DEST/python-aodhclient
# Get rid of this before done.
# Tell emacs to use shell-script-mode