openstack
/
zun
Code Issues Proposed changes

Merge "devstack: add zun client to devstack"

This commit is contained in:
Jenkins 2016-08-25 04:45:10 +00:00 committed by Gerrit Code Review
parent 0fd368685e fcf46e8b5d
commit b6ab72ee56
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/lib/zun
View File

@ -33,6 +33,10 @@ ZUN_REPO=${ZUN_REPO:-${GIT_BASE}/openstack/higgins.git}
ZUN_BRANCH=${ZUN_BRANCH:-master}
ZUN_DIR=$DEST/higgins
GITREPO["python-zunclient"]=${ZUNCLIENT_REPO:-${GIT_BASE}/openstack/python-zunclient.git}
GITBRANCH["python-zunclient"]=${ZUNCLIENT_BRANCH:-master}
GITDIR["python-zunclient"]=$DEST/python-zunclient
ZUN_STATE_PATH=${ZUN_STATE_PATH:=$DATA_DIR/zun}
ZUN_AUTH_CACHE_DIR=${ZUN_AUTH_CACHE_DIR:-/var/cache/zun}

7
devstack/plugin.sh
View File

@ -13,11 +13,10 @@ if is_service_enabled zun-api zun-compute; then
echo_summary "Installing zun"
install_zun
# TODO
# LIBS_FROM_GIT="${LIBS_FROM_GIT},python-zunclient"
# install_zunclient
LIBS_FROM_GIT="${LIBS_FROM_GIT},python-zunclient"
install_zunclient
cleanup_zun
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
echo_summary "Configuring zun"
configure_zun