Browse code
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
Bob Ball authored on 2016/06/13 17:09:44Showing 1 changed files
| ... | ... |
@@ -286,8 +286,8 @@ GITREPO["python-cinderclient"]=${CINDERCLIENT_REPO:-${GIT_BASE}/openstack/python
|
| 286 | 286 |
GITBRANCH["python-cinderclient"]=${CINDERCLIENT_BRANCH:-master}
|
| 287 | 287 |
|
| 288 | 288 |
# os-brick client for local volume attachement |
| 289 |
-GITREPO["python-brick-cinderclient-ext"]=${CINDERCLIENT_REPO:-${GIT_BASE}/openstack/python-brick-cinderclient-ext.git}
|
|
| 290 |
-GITBRANCH["python-brick-cinderclient-ext"]=${CINDERCLIENT_BRANCH:-master}
|
|
| 289 |
+GITREPO["python-brick-cinderclient-ext"]=${BRICK_CINDERCLIENT_REPO:-${GIT_BASE}/openstack/python-brick-cinderclient-ext.git}
|
|
| 290 |
+GITBRANCH["python-brick-cinderclient-ext"]=${BRICK_CINDERCLIENT_BRANCH:-master}
|
|
| 291 | 291 |
|
| 292 | 292 |
# python glance client library |
| 293 | 293 |
GITREPO["python-glanceclient"]=${GLANCECLIENT_REPO:-${GIT_BASE}/openstack/python-glanceclient.git}
|