openstack/deb-sahara
Code Issues Proposed changes

Merge "Fix installing python-saharaclient"

Browse Source
This commit is contained in:
Jenkins 2015-07-16 22:17:17 +00:00 committed by Gerrit Code Review
commit 49dad6637a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/plugin.sh
View File

@ -167,8 +167,8 @@ function install_sahara {
# install_python_saharaclient() - Collect source and prepare
function install_python_saharaclient {
if use_library_from_git "python-saharaclient"; then
git_clone_by_name "python-saharaclient"
setup_dev_lib "python-saharaclient"
git_clone $SAHARACLIENT_REPO $SAHARACLIENT_DIR $SAHARACLIENT_BRANCH
setup_develop $SAHARACLIENT_DIR
fi
}

5
devstack/settings
View File

@ -2,9 +2,12 @@
# -------------------------------------
# Set up default directories
GITDIR["python-saharaclient"]=$DEST/python-saharaclient
SAHARACLIENT_DIR=$DEST/python-saharaclient
SAHARA_DIR=$DEST/sahara
SAHARACLIENT_REPO=${SAHARACLIENT_REPO:-${GIT_BASE}/openstack/python-saharaclient.git}
SAHARACLIENT_BRANCH=${SAHARACLIENT_BRANCH:-master}
SAHARA_CONF_DIR=${SAHARA_CONF_DIR:-/etc/sahara}
SAHARA_CONF_FILE=${SAHARA_CONF_DIR}/sahara.conf