openstack/deb-sahara
Code Issues Proposed changes

Fix installing python-saharaclient

Browse Source 
Change-Id: I1eaf928176bccda213d9ca03062c3a3b5ec6eadc
This commit is contained in:
Sergey Reshetnyak 2015-07-15 19:32:09 +03:00
parent eb1d949dff
commit f757d88c01
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 # install_python_saharaclient() - Collect source and prepare
function install_python_saharaclient { function install_python_saharaclient {
if use_library_from_git "python-saharaclient"; then if use_library_from_git "python-saharaclient"; then
git_clone_by_name "python-saharaclient" git_clone $SAHARACLIENT_REPO $SAHARACLIENT_DIR $SAHARACLIENT_BRANCH
setup_dev_lib "python-saharaclient" setup_develop $SAHARACLIENT_DIR
fi fi
} }

5
devstack/settings
View File

@ -2,9 +2,12 @@
# ------------------------------------- # -------------------------------------
# Set up default directories # Set up default directories
GITDIR["python-saharaclient"]=$DEST/python-saharaclient SAHARACLIENT_DIR=$DEST/python-saharaclient
SAHARA_DIR=$DEST/sahara 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_DIR=${SAHARA_CONF_DIR:-/etc/sahara}
SAHARA_CONF_FILE=${SAHARA_CONF_DIR}/sahara.conf SAHARA_CONF_FILE=${SAHARA_CONF_DIR}/sahara.conf