openstack
/
cloudkitty
Code Issues Proposed changes

Added CloudKitty client install to devstack 

Use the stackforge/python-cloudkittyclient repository to install the
client library and CLI.

Change-Id: If068b7c1473728d4e448cb8a75c844a1e18b6e71
This commit is contained in:
Gauvain Pocentek 2015-04-19 08:56:38 +02:00
parent 32ace95de7
commit dd81c45eb1
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/devstack/extras.d/70-cloudkitty.sh
View File

@ -7,6 +7,7 @@ if is_service_enabled ck-api; then
elif [[ "$1" == "stack" && "$2" == "install" ]]; then
echo_summary "Installing CloudKitty"
install_cloudkitty
install_python_cloudkittyclient
cleanup_cloudkitty
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
echo_summary "Configuring CloudKitty"

11
contrib/devstack/lib/cloudkitty
View File

@ -23,6 +23,7 @@
# start_cloudkitty
# stop_cloudkitty
# cleanup_cloudkitty
# install_python_cloudkittyclient
# Save trace setting
XTRACE=$(set +o | grep xtrace)
@ -74,6 +75,10 @@ CLOUDKITTY_OUTPUT_BACKEND=${CLOUDKITTY_OUTPUT_BACKEND:-"cloudkitty.backend.file.
CLOUDKITTY_OUTPUT_BASEPATH=${CLOUDKITTY_OUTPUT_BASEPATH:-$CLOUDKITTY_REPORTS_DIR}
CLOUDKITTY_OUTPUT_PIPELINE=${CLOUDKITTY_OUTPUT_PIPELINE:-"osrf"}
# Set Cloudkitty client info
GITREPO["python-cloudkittyclient"]=${CLOUDKITTYCLIENT_REPO:-${GIT_BASE}/stackforge/python-cloudkittyclient.git}
GITDIR["python-cloudkittyclient"]=$DEST/python-cloudkittyclient
GITBRANCH["python-cloudkittyclient"]=${CLOUDKITTYCLIENT_BRANCH:-master}
# Tell Tempest this project is present
TEMPEST_SERVICES+=,cloudkitty
@ -228,6 +233,12 @@ function stop_cloudkitty {
done
}
# install_python_cloudkittyclient() - Collect source and prepare
function install_python_cloudkittyclient {
# Install from git since we don't have a release (yet)
git_clone_by_name "python-cloudkittyclient"
setup_dev_lib "python-cloudkittyclient"
}
# Restore xtrace
$XTRACE