Added to requirements:
https://review.openstack.org/309084
Functional tests were added
https://review.openstack.org/265811
But they still use the version of python-brick-cinderclient-ext from pip.
This change updates devstack to pull in the changes from
python-brick-cinderclient-ext patch sets instead, when configured to do so.
Change-Id: I6d0f09950ea1200d3367a53aa4a3eea9be7abc66
Needed-by: I34f3b5ceaad7a50b1e9cadcc764f61c0aabe086d
| ... | ... |
@@ -40,6 +40,7 @@ fi |
| 40 | 40 |
# set up default directories |
| 41 | 41 |
GITDIR["python-cinderclient"]=$DEST/python-cinderclient |
| 42 | 42 |
GITDIR["os-brick"]=$DEST/os-brick |
| 43 |
+GITDIR["python-brick-cinderclient-ext"]=$DEST/python-brick-cinderclient-ext |
|
| 43 | 44 |
CINDER_DIR=$DEST/cinder |
| 44 | 45 |
|
| 45 | 46 |
# Cinder virtual environment |
| ... | ... |
@@ -466,6 +467,11 @@ function install_cinder {
|
| 466 | 466 |
|
| 467 | 467 |
# install_cinderclient() - Collect source and prepare |
| 468 | 468 |
function install_cinderclient {
|
| 469 |
+ if use_library_from_git "python-brick-cinderclient-ext"; then |
|
| 470 |
+ git_clone_by_name "python-brick-cinderclient-ext" |
|
| 471 |
+ setup_dev_lib "python-brick-cinderclient-ext" |
|
| 472 |
+ fi |
|
| 473 |
+ |
|
| 469 | 474 |
if use_library_from_git "python-cinderclient"; then |
| 470 | 475 |
git_clone_by_name "python-cinderclient" |
| 471 | 476 |
setup_dev_lib "python-cinderclient" |
| ... | ... |
@@ -285,6 +285,10 @@ TEMPEST_BRANCH=${TEMPEST_BRANCH:-master}
|
| 285 | 285 |
GITREPO["python-cinderclient"]=${CINDERCLIENT_REPO:-${GIT_BASE}/openstack/python-cinderclient.git}
|
| 286 | 286 |
GITBRANCH["python-cinderclient"]=${CINDERCLIENT_BRANCH:-master}
|
| 287 | 287 |
|
| 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}
|
|
| 291 |
+ |
|
| 288 | 292 |
# python glance client library |
| 289 | 293 |
GITREPO["python-glanceclient"]=${GLANCECLIENT_REPO:-${GIT_BASE}/openstack/python-glanceclient.git}
|
| 290 | 294 |
GITBRANCH["python-glanceclient"]=${GLANCECLIENT_BRANCH:-master}
|
| ... | ... |
@@ -42,7 +42,7 @@ ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy" |
| 42 | 42 |
ALL_LIBS+=" debtcollector os-brick automaton futurist oslo.service" |
| 43 | 43 |
ALL_LIBS+=" oslo.cache oslo.reports osprofiler" |
| 44 | 44 |
ALL_LIBS+=" keystoneauth ironic-lib neutron-lib oslo.privsep" |
| 45 |
-ALL_LIBS+=" diskimage-builder os-vif" |
|
| 45 |
+ALL_LIBS+=" diskimage-builder os-vif python-brick-cinderclient-ext" |
|
| 46 | 46 |
|
| 47 | 47 |
# Generate the above list with |
| 48 | 48 |
# echo ${!GITREPO[@]}
|