commit 1d23b93568e113169da54cff31ff8a2908648c02
author Bob Ball <bob.ball@citrix.com> Mon Jun 13 09:09:44 2016 +0100
committer Bob Ball <bob.ball@citrix.com> Tue Jun 14 12:07:52 2016 +0000
tree 45c9bd59de4cd99dfd6022b27b025f7c96c546e7
parent e13c933d7001faa254b17b2f7d396cfe23a43c3e

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

diff --git a/stackrc b/stackrc
index 969d77d..7a5b821 100644
--- a/stackrc
+++ b/stackrc
@@ -286,8 +286,8 @@
 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}