From 1d23b93568e113169da54cff31ff8a2908648c02 Mon Sep 17 00:00:00 2001 From: Bob Ball Date: Mon, 13 Jun 2016 09:09:44 +0100 Subject: [PATCH] Fix brick cinderclient override CINDERCLIENT_REPO cannot refer to both python-cinderclient.git and python-brick-cinderclient-ext.git so make sure the overrides have different names. Bug introduced by: I6d0f09950ea1200d3367a53aa4a3eea9be7abc66 Change-Id: I9cbbf71ba08ef5394537d7b294846faa3c5be5bd --- stackrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stackrc b/stackrc index 969d77d95c..7a5b821d4e 100644 --- a/stackrc +++ b/stackrc @@ -286,8 +286,8 @@ GITREPO["python-cinderclient"]=${CINDERCLIENT_REPO:-${GIT_BASE}/openstack/python GITBRANCH["python-cinderclient"]=${CINDERCLIENT_BRANCH:-master} # os-brick client for local volume attachement -GITREPO["python-brick-cinderclient-ext"]=${CINDERCLIENT_REPO:-${GIT_BASE}/openstack/python-brick-cinderclient-ext.git} -GITBRANCH["python-brick-cinderclient-ext"]=${CINDERCLIENT_BRANCH:-master} +GITREPO["python-brick-cinderclient-ext"]=${BRICK_CINDERCLIENT_REPO:-${GIT_BASE}/openstack/python-brick-cinderclient-ext.git} +GITBRANCH["python-brick-cinderclient-ext"]=${BRICK_CINDERCLIENT_BRANCH:-master} # python glance client library GITREPO["python-glanceclient"]=${GLANCECLIENT_REPO:-${GIT_BASE}/openstack/python-glanceclient.git}