Browse code
Add debtcollector to lib/oslo and stackrc
Ensure that the debtcollector library is pulled in
like the other oslo libraries so that devstack can
use it where appropriate.
Also fixes 'test_libs_from_pypi.sh' to not have a huge
single line of libraries; and splits it into multiple
lines so the diffs and code can be easily looked at.
Change-Id: I35ab0ed0e20b6092a41ecb3b6f1aaf0a05f5180e
Joshua Harlow authored on 2015/02/20 08:06:23Showing 3 changed files
| ... | ... |
@@ -23,6 +23,7 @@ set +o xtrace |
| 23 | 23 |
# Defaults |
| 24 | 24 |
# -------- |
| 25 | 25 |
GITDIR["cliff"]=$DEST/cliff |
| 26 |
+GITDIR["debtcollector"]=$DEST/debtcollector |
|
| 26 | 27 |
GITDIR["oslo.concurrency"]=$DEST/oslo.concurrency |
| 27 | 28 |
GITDIR["oslo.config"]=$DEST/oslo.config |
| 28 | 29 |
GITDIR["oslo.context"]=$DEST/oslo.context |
| ... | ... |
@@ -58,6 +59,7 @@ function _do_install_oslo_lib {
|
| 58 | 58 |
# install_oslo() - Collect source and prepare |
| 59 | 59 |
function install_oslo {
|
| 60 | 60 |
_do_install_oslo_lib "cliff" |
| 61 |
+ _do_install_oslo_lib "debtcollector" |
|
| 61 | 62 |
_do_install_oslo_lib "oslo.concurrency" |
| 62 | 63 |
_do_install_oslo_lib "oslo.config" |
| 63 | 64 |
_do_install_oslo_lib "oslo.context" |
| ... | ... |
@@ -314,6 +314,10 @@ GITDIR["python-openstackclient"]=$DEST/python-openstackclient |
| 314 | 314 |
GITREPO["cliff"]=${CLIFF_REPO:-${GIT_BASE}/openstack/cliff.git}
|
| 315 | 315 |
GITBRANCH["cliff"]=${CLIFF_BRANCH:-master}
|
| 316 | 316 |
|
| 317 |
+# debtcollector deprecation framework/helpers |
|
| 318 |
+GITREPO["debtcollector"]=${DEBTCOLLECTOR_REPO:-${GIT_BASE}/openstack/debtcollector.git}
|
|
| 319 |
+GITBRANCH["debtcollector"]=${DEBTCOLLECTOR_BRANCH:-master}
|
|
| 320 |
+ |
|
| 317 | 321 |
# oslo.concurrency |
| 318 | 322 |
GITREPO["oslo.concurrency"]=${OSLOCON_REPO:-${GIT_BASE}/openstack/oslo.concurrency.git}
|
| 319 | 323 |
GITBRANCH["oslo.concurrency"]=${OSLOCON_BRANCH:-master}
|
| ... | ... |
@@ -29,7 +29,17 @@ for i in $TOP/lib/*; do |
| 29 | 29 |
fi |
| 30 | 30 |
done |
| 31 | 31 |
|
| 32 |
-ALL_LIBS="python-novaclient oslo.config pbr oslo.context python-troveclient python-keystoneclient taskflow oslo.middleware pycadf python-glanceclient python-ironicclient tempest-lib oslo.messaging oslo.log cliff python-heatclient stevedore python-cinderclient glance_store oslo.concurrency oslo.db oslo.vmware keystonemiddleware oslo.serialization python-saharaclient django_openstack_auth python-openstackclient oslo.rootwrap oslo.i18n python-ceilometerclient oslo.utils python-swiftclient python-neutronclient tooz ceilometermiddleware oslo.policy" |
|
| 32 |
+ALL_LIBS="python-novaclient oslo.config pbr oslo.context python-troveclient" |
|
| 33 |
+ALL_LIBS+=" python-keystoneclient taskflow oslo.middleware pycadf" |
|
| 34 |
+ALL_LIBS+=" python-glanceclient python-ironicclient tempest-lib" |
|
| 35 |
+ALL_LIBS+=" oslo.messaging oslo.log cliff python-heatclient stevedore" |
|
| 36 |
+ALL_LIBS+=" python-cinderclient glance_store oslo.concurrency oslo.db" |
|
| 37 |
+ALL_LIBS+=" oslo.vmware keystonemiddleware oslo.serialization" |
|
| 38 |
+ALL_LIBS+=" python-saharaclient django_openstack_auth" |
|
| 39 |
+ALL_LIBS+=" python-openstackclient oslo.rootwrap oslo.i18n" |
|
| 40 |
+ALL_LIBS+=" python-ceilometerclient oslo.utils python-swiftclient" |
|
| 41 |
+ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy" |
|
| 42 |
+ALL_LIBS+=" debtcollector" |
|
| 33 | 43 |
|
| 34 | 44 |
# Generate the above list with |
| 35 | 45 |
# echo ${!GITREPO[@]}
|