Browse code
Revert "Add oslo.log"
This reverts commit 13249f87093219f4d0038effc1e5907230a470c3.
We don't have anything that would depend on (not released yet) oslo.log in
Juno, and it currently makes requirements updates to fail due to missing
oslo.context dependency in global-requirements.txt, so instead of adding it
there, let's just drop oslo.log installation from devstack.
That's Juno only, master is not touched.
Conflicts:
lib/oslo
stackrc
Change-Id: Ib0e113302c00927348e27fe686a759b040b30f9a
Ihar Hrachyshka authored on 2015/01/09 23:51:20Showing 3 changed files
| ... | ... |
@@ -25,7 +25,6 @@ GITDIR["oslo.config"]=$DEST/oslo.config |
| 25 | 25 |
GITDIR["oslo.concurrency"]=$DEST/oslo.concurrency |
| 26 | 26 |
GITDIR["oslo.db"]=$DEST/oslo.db |
| 27 | 27 |
GITDIR["oslo.i18n"]=$DEST/oslo.i18n |
| 28 |
-GITDIR["oslo.log"]=$DEST/oslo.log |
|
| 29 | 28 |
GITDIR["oslo.middleware"]=$DEST/oslo.middleware |
| 30 | 29 |
GITDIR["oslo.messaging"]=$DEST/oslo.messaging |
| 31 | 30 |
GITDIR["oslo.rootwrap"]=$DEST/oslo.rootwrap |
| ... | ... |
@@ -58,7 +57,6 @@ function install_oslo {
|
| 58 | 58 |
_do_install_oslo_lib "oslo.serialization" |
| 59 | 59 |
_do_install_oslo_lib "oslo.config" |
| 60 | 60 |
_do_install_oslo_lib "oslo.concurrency" |
| 61 |
- _do_install_oslo_lib "oslo.log" |
|
| 62 | 61 |
_do_install_oslo_lib "oslo.middleware" |
| 63 | 62 |
_do_install_oslo_lib "oslo.messaging" |
| 64 | 63 |
_do_install_oslo_lib "oslo.rootwrap" |
| ... | ... |
@@ -278,10 +278,6 @@ GITBRANCH["oslo.db"]=${OSLODB_BRANCH:-master}
|
| 278 | 278 |
GITREPO["oslo.i18n"]=${OSLOI18N_REPO:-${GIT_BASE}/openstack/oslo.i18n.git}
|
| 279 | 279 |
GITBRANCH["oslo.i18n"]=${OSLOI18N_BRANCH:-master}
|
| 280 | 280 |
|
| 281 |
-# oslo.log |
|
| 282 |
-GITREPO["oslo.log"]=${OSLOLOG_REPO:-${GIT_BASE}/openstack/oslo.log.git}
|
|
| 283 |
-GITBRANCH["oslo.log"]=${OSLOLOG_BRANCH:-master}
|
|
| 284 |
- |
|
| 285 | 281 |
# oslo.messaging |
| 286 | 282 |
GITREPO["oslo.messaging"]=${OSLOMSG_REPO:-${GIT_BASE}/openstack/oslo.messaging.git}
|
| 287 | 283 |
GITBRANCH["oslo.messaging"]=${OSLOMSG_BRANCH:-master}
|
| ... | ... |
@@ -27,7 +27,7 @@ for i in $TOP/lib/*; do |
| 27 | 27 |
fi |
| 28 | 28 |
done |
| 29 | 29 |
|
| 30 |
-ALL_LIBS="python-novaclient oslo.config pbr 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" |
|
| 30 |
+ALL_LIBS="python-novaclient oslo.config pbr python-troveclient python-keystoneclient taskflow oslo.middleware pycadf python-glanceclient python-ironicclient tempest-lib oslo.messaging 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" |
|
| 31 | 31 |
|
| 32 | 32 |
# Generate the above list with |
| 33 | 33 |
# echo ${!GITREPO[@]}
|