From 450bdc1b84e01c3493dc338870f82e2dcba63b31 Mon Sep 17 00:00:00 2001 From: ZhiQiang Fan Date: Sun, 17 Apr 2016 06:50:15 +0800 Subject: [PATCH] install aodhclient instead of ceilometerclient python-ceilometerclient already in requirements list, and we already have python-aodhclient, let's use it Change-Id: I7f2f01d411b4aaa6433846717bbc9966bb9548cf --- devstack/plugin.sh | 10 +++++----- devstack/settings | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 162af6df8..670d76051 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -306,13 +306,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 diff --git a/devstack/settings b/devstack/settings index 3644b7cb2..6a0e55498 100644 --- a/devstack/settings +++ b/devstack/settings @@ -37,8 +37,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