From 935e6fab5f7c38e247aa51dfa658e6117ff34cd9 Mon Sep 17 00:00:00 2001 From: Yuval Brik Date: Tue, 9 May 2017 15:51:26 +0300 Subject: [PATCH] Set git info for python-karborclient Change-Id: Icc8d7d94922148160f0069c8c48560351a60a31d --- devstack/plugin.sh | 4 ++-- devstack/settings | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 1c813f6e..1e638c00 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -153,8 +153,8 @@ function create_karbor_cache_dir { function install_karborclient { if use_library_from_git "python-karborclient"; then echo_summary "Installing Karbor Client from git" - git_clone_by_name "python-karborclient" - setup_dev_lib "python-karborclient" + git_clone $KARBORCLIENT_REPO $KARBORCLIENT_DIR $KARBORCLIENT_BRANCH + setup_develop $KARBORCLIENT_DIR fi } diff --git a/devstack/settings b/devstack/settings index 0247dbb5..02884c19 100644 --- a/devstack/settings +++ b/devstack/settings @@ -2,6 +2,9 @@ KARBOR_REPO=${KARBOR_REPO:-https://git.openstack.org/cgit/openstack/karbor/} KARBOR_DIR=$DEST/karbor KARBOR_BRANCH=${KARBOR_BRANCH:-master} +KARBORCLIENT_REPO=${KARBORCLIENT_REPO:-"https://git.openstack.org/cgit/openstack/python-karborclient/"} +KARBORCLIENT_DIR=$DEST/python-karborclient +KARBORCLIENT_BRANCH=${KARBORCLIENT_BRANCH:-master} # Toggle for deploying Karbor under apache2 in mod_wsgi KARBOR_USE_MOD_WSGI=${KARBOR_USE_MOD_WSGI:-True}