openstack/cloudkitty
Code Issues Proposed changes

Merge "Added CloudKitty client install to devstack"

Browse Source
This commit is contained in:
Jenkins
2015-04-20 16:33:39 +00:00
committed by Gerrit Code Review
parent aa48344199 dd81c45eb1
commit 262b231ce7
2 changed files with 12 additions and 0 deletions
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 elif [[ "$1" == "stack" && "$2" == "install" ]]; then
echo_summary "Installing CloudKitty" echo_summary "Installing CloudKitty"
install_cloudkitty install_cloudkitty
install_python_cloudkittyclient
cleanup_cloudkitty cleanup_cloudkitty
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
echo_summary "Configuring CloudKitty" echo_summary "Configuring CloudKitty"

11
contrib/devstack/lib/cloudkitty
View File

@@ -23,6 +23,7 @@
# start_cloudkitty # start_cloudkitty
# stop_cloudkitty # stop_cloudkitty
# cleanup_cloudkitty # cleanup_cloudkitty
# install_python_cloudkittyclient
# Save trace setting # Save trace setting
XTRACE=$(set +o | grep xtrace) 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_BASEPATH=${CLOUDKITTY_OUTPUT_BASEPATH:-$CLOUDKITTY_REPORTS_DIR}
CLOUDKITTY_OUTPUT_PIPELINE=${CLOUDKITTY_OUTPUT_PIPELINE:-"osrf"} 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 # Tell Tempest this project is present
TEMPEST_SERVICES+=,cloudkitty TEMPEST_SERVICES+=,cloudkitty
@@ -228,6 +233,12 @@ function stop_cloudkitty {
done 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 # Restore xtrace
$XTRACE $XTRACE