summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-05-12 15:49:20 (GMT)
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-06-11 09:37:26 (GMT)
commit79dcb4776822cde1b0b3f3870f3fe26a7bc40d4a (patch)
treee57fec5032416e86fb4637cfbc35c462ff2b76aa
parent94ffa8c1e36602543f7f02a218d5ef7185796cda (diff)
downloaddefinitions-79dcb4776822cde1b0b3f3870f3fe26a7bc40d4a.tar.gz
OpenStack: Upgrade components to Kilo
New components needed: - ordereddict 1.1 - oslo-concurrency 1.8.0 - oslo-context 0.2.0 - posix-ipc - oslo-log 1.0.0 - oslo-middleware 1.2.0 - aioeventlet 0.4 - trollius 1.0.4 - urllib3 1.10.4 - semantic-version 2.4.1 - pysaml2 2.4.0 - redis-py 2.10.3 - kafka-python 0.9.3 - werkzeug 0.10.4 - gf-complete 2 - jerasure 2 - liberasurecode 1.0.7 - pyeclib 1.0.7 - pint 0.6 as a horizon dependency - xstatic-angular-lrdragndrop 1.0.2.3 - xstatic-magic-search 0.2.0.1 - xstatic-termjs 0.0.4.2 - tempest-lib 0.5.0 The following upgrades were needed: - eventlet to v0.17.3 - sqlalchemy-migrate to 0.9.6 - httplib2 to v0.9.1 - kombu to v3.0.26 - oslo-config to 1.9.3 - oslo-utils to 1.4.0 - taskflow to 0.7.1 - keystonemiddleware to 1.5.1 - pycadf to 0.9.0 - oslo-vmware to 0.11.0 - suds to 0.4 - oslo-serialization to 1.4.0 - python-keystoneclient to 1.3.1 - oslo-i18n to 1.5.0 - oslo-db to 1.7.1 - alembic to 0.7.6 - testscenarios to 0.4 - oslo-messaging to 1.8.2 - oslo-policy 0.3.2 - glance_store to 0.4.0 - python-neutronclient to 2.4.0 - cmd2 to 0.6.7 - cliff to 1.10.1 - python-glanceclient to 0.17.1 - websockify to 0.6.1 - oslo-rootwrap to 1.6.0 - python-novaclient to 2.23.0 - python-barbicanclient to 3.0.3 - python-ceilometerclient to 1.0.14 - tooz to 0.13.2 - pymemcache to v1.2.9 - zake to 0.2.1 - django-openstack-auth to 1.2.0 - python-heatclient to 0.4.0 - python-saharaclient to 0.8.0 - xstatic-bootstrap-datepicker to 1.3.1 - xstatic-bootstrap-scss to 3.1.1.1 - xstatic-d3 to 3.1.6.2 - xstatic-hogan to 2.0.0.2 - testscenarios to 0.4 Other changes: - Use a stable version of prettytables 0.7.2 so that we know the version number of if. - Move netifaces to openstack-common, because it's needed for the new version of oslo-utils. - Remove duplicated oauthlib keeping the most recent - Rename pysinglefile to pysendfile - Add ironic runtime dependencies as build dependencies to track some information about them, and to be consistent with other OpenStack components. Change-Id: Ib8b5ac3ede6d37978a6665802cb24ae7a73d9b58
-rw-r--r--strata/openstack-clients.morph44
-rw-r--r--strata/openstack-common.morph30
-rw-r--r--strata/openstack-services.morph277
-rw-r--r--strata/python-common.morph4
-rw-r--r--strata/swift.morph34
-rw-r--r--strata/test-tools.morph10
-rw-r--r--strata/xstatic.morph20
7 files changed, 290 insertions, 129 deletions
diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph
index 32e0f35..da177fc 100644
--- a/strata/openstack-clients.morph
+++ b/strata/openstack-clients.morph
@@ -10,19 +10,19 @@ chunks:
unpetrify-ref: 1.1.0
- name: python-keystoneclient
repo: upstream:openstack/python-keystoneclient
- ref: 79d1eec35aad874a7c08ff22c39260884a5524ba
- unpetrify-ref: 0.11.1
+ ref: 8fa6b6f0b5e95493342ce71489d04f73db2418b8
+ unpetrify-ref: 1.3.1
- name: python-glanceclient
repo: upstream:openstack/python-glanceclient
- ref: 8a877b2752162d6a2db43d7d61d6311c4f42285b
- unpetrify-ref: 0.14.1
+ ref: b176c28bbdae3eb5b3280c1981ad2b3b255e234e
+ unpetrify-ref: 0.17.1
build-depends:
- python-keystoneclient
- warlock
- name: python-novaclient
repo: upstream:openstack/python-novaclient
- ref: 5ecfdac6b34769e200ff5c4c7429c20518c5b24f
- unpetrify-ref: 2.20.0
+ ref: e0f5072907a00d48a183dd8fc91a6cf6038ca279
+ unpetrify-ref: 2.23.0
build-depends:
- python-keystoneclient
- name: python-swiftclient
@@ -45,35 +45,35 @@ chunks:
ref: 8062c76ab3958a570052124f17e71f3dd3ec2257
unpetrify-ref: pyparsing_2.0.3
- name: cmd2
- repo: upstream:python-packages/cmd2.git
- ref: 07b4dc3d6991cbdc420c246e807371c97a467d1a
- unpetrify-ref: master
+ repo: upstream:python-packages/cmd2-hg
+ ref: c0d606bdeb88717ad92ba198bc9232615b83c4cd
+ unpetrify-ref: 0.6.7
build-depends:
- pyparsing
- name: cliff
repo: upstream:openstack/cliff
- ref: 42675b2d7ad93f4bba9c4216874c68b8e5834147
- unpetrify-ref: 1.7.0
+ ref: b703ad32743026d253f872caa1ff2cd727803d14
+ unpetrify-ref: 1.10.1
build-depends:
- cmd2
- pyparsing
- name: python-neutronclient
repo: upstream:openstack/python-neutronclient
- ref: fa5642f1550bc8f818c1686c40edbaf3672d356a
- unpetrify-ref: 2.3.9
+ ref: aa1215a5ad063b299d32ef319eb63d5210249a9b
+ unpetrify-ref: 2.4.0
build-depends:
- cliff
- python-keystoneclient
- name: python-ceilometerclient
repo: upstream:openstack/python-ceilometerclient
- ref: 7316dd16b8850270db27c1298dcf5a2223f2f1e1
- unpetrify-ref: 1.0.12
+ ref: 127aadfd2b2daf9884ad7003e23440048e2efbd8
+ unpetrify-ref: 1.0.14
build-depends:
- python-keystoneclient
- name: python-heatclient
repo: upstream:openstack/python-heatclient
- ref: 6089d31e302d80910cc15132f99a1bf358bbb64f
- unpetrify-ref: 0.2.12
+ ref: 6d528f005742263837d05250662bf6214a703da8
+ unpetrify-ref: 0.4.0
build-depends:
- python-keystoneclient
- name: python-designateclient
@@ -84,16 +84,16 @@ chunks:
- cliff
- python-keystoneclient
- name: python-barbicanclient
- repo: upstream:openstack/python-barbicanclient.git
- ref: ac30643631b6bc1c40116061f8eb280a7881e422
- unpetrify-ref: 2.2.1
+ repo: upstream:openstack/python-barbicanclient
+ ref: 2919366867af335d59913764a55ca8e95569947d
+ unpetrify-ref: 3.0.3
build-depends:
- python-keystoneclient
- cliff
- name: python-saharaclient
repo: upstream:openstack/python-saharaclient
- ref: eadb40ccb62566f02cb93ec03aa232e48835dec3
- unpetrify-ref: 0.7.6
+ ref: 319ceb6acf55382218dcd971367613aecb3e4afc
+ unpetrify-ref: 0.8.0
build-depends:
- python-keystoneclient
- name: python-ironicclient
diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph
index 78c04ba..f80e88a 100644
--- a/strata/openstack-common.morph
+++ b/strata/openstack-common.morph
@@ -52,13 +52,13 @@ chunks:
ref: bbb31ed50a5338a7d1c0011fc4429d09954f9f0b
unpetrify-ref: release-0.7.12
- name: stevedore
- ref: 860bd8f8ecba38fdfda5b41a3a1dbe854d6528e2
- unpetrify-ref: 1.0.0.0a2
repo: upstream:openstack/stevedore
+ ref: 218e95d5f09563bd14c50ee0441855f3389af7e7
+ unpetrify-ref: 1.3.0
- name: oslo-config
repo: upstream:openstack/oslo-config
- ref: 059579ac2189b94bc9e9555b2e9acfb31a83ef53
- unpetrify-ref: 1.4.0.0a5
+ ref: 3c51838cdffe7a5057ff4823a8ab523bfacc3164
+ unpetrify-ref: 1.9.3
build-depends:
- netaddr
- stevedore
@@ -68,26 +68,32 @@ chunks:
unpetrify-ref: 0.14
- name: oslo-i18n
repo: upstream:openstack/oslo-i18n
- ref: 040f1d6afa733527385d2309e485bf37e9843b0e
- unpetrify-ref: 0.4.0
+ ref: b0faab7b3d3ea3b14053ab92dd6086956f643e15
+ unpetrify-ref: 1.5.0
build-depends:
- babel
+- name: netifaces
+ repo: upstream:python-packages/netifaces
+ ref: 885b200ba717df87f6e8044ec8c66c677c949bcb
+ unpetrify-ref: release_0_10_4
- name: oslo-utils
repo: upstream:openstack/oslo-utils
- ref: 6a123fce93895e92004ce9d5bd8dee3c3642cf41
- unpetrify-ref: 0.3.0
+ ref: 91dc782c2f11fb76425effd7a331d63111adf1ce
+ unpetrify-ref: 1.4.0
build-depends:
- babel
- pyiso8601
- oslo-i18n
+ - netifaces
+ - netaddr
- name: futures
repo: upstream:python-packages/futures
ref: 4f7ceedb8a7742e52b0436a4160c7c44665a2597
unpetrify-ref: 2.2.0
- name: oslo-serialization
repo: upstream:openstack/oslo-serialization.git
- ref: 80fec894a54253d9b4c80dd8a563957966ca0b88
- unpetrify-ref: 0.3.0
+ ref: 7bfd5dece0f22dbdea1c3e524dbc0eca1f70f1b7
+ unpetrify-ref: 1.4.0
- name: jsonschema
repo: upstream:jsonschema
ref: 35b60f390098d3306c03eee27ceec8cf8a493579
@@ -101,8 +107,8 @@ chunks:
unpetrify-ref: 0.4.5
repo: upstream:python-packages/greenlet
- name: eventlet
- ref: 8d2474197de4827a7bca9c33e71a82573b6fc721
- unpetrify-ref: v0.15.2
+ ref: bc0a59f8efdb6d436dd41bcf1b2194b8967bfe7f
+ unpetrify-ref: v0.17.3
repo: upstream:python-packages/eventlet
build-depends:
- greenlet
diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index 484aa95..777a5ea 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -28,8 +28,8 @@ chunks:
- rabbitmq-codegen
- name: oslo-rootwrap
repo: upstream:openstack/oslo-rootwrap
- ref: 62d732277de5cf663172eafe6d3a6c149a9cf814
- unpetrify-ref: master
+ ref: f485b93f475b119e3b8fa6c9cf740207e2d2d7ac
+ unpetrify-ref: 1.6.0
- name: py-amqp
repo: upstream:python-packages/py-amqp
ref: 875b10d1715def640042c7ff2f42c00a6c07eed1
@@ -47,8 +47,8 @@ chunks:
unpetrify-ref: 0.3.3
- name: kombu
repo: upstream:python-packages/kombu
- ref: 6e68e54b3a846faa6f8b7e14a4a7ca51d1967bc2
- unpetrify-ref: v3.0.23
+ ref: 0287b11ab0698d9c52ef1b1683ced23123d43ba4
+ unpetrify-ref: v3.0.26
build-depends:
- anyjson
- py-amqp
@@ -59,8 +59,8 @@ chunks:
unpetrify-ref: rel_0_9_8
- name: alembic
repo: upstream:python-packages/alembic
- ref: 5f952f25caa688d89204d134ee867de7dbad917c
- unpetrify-ref: rel_0_7_1
+ ref: 6ae4196acc0170ebef29f617b49376b371a8923c
+ unpetrify-ref: rel_0_7_6
build-depends:
- sqlalchemy
- name: lockfile
@@ -191,13 +191,13 @@ chunks:
build-depends:
- numpy
- name: httplib2
- ref: 058a1f9448d5c27c23772796f83a596caf9188e6
- unpetrify-ref: v0.9
repo: upstream:python-packages/httplib2
+ ref: f9f797223d075874b0031aea832152688ec23fef
+ unpetrify-ref: v0.9.1
- name: suds
repo: upstream:python-packages/suds
- ref: badd30a87f676d632d7386b05401e6029a5df83c
- unpetrify-ref: release-0.3.2
+ ref: e7a317f1a20a4d3c86ac85785bb32d24c3d1078f
+ unpetrify-ref: baserock/release-0.4
- name: jsonrpclib
repo: upstream:python-packages/jsonrpclib
ref: 53c8ffcfe4dd1718086cc551dce8ac459e8abc67
@@ -275,33 +275,73 @@ chunks:
repo: upstream:python-packages/retrying
ref: cab083eb5791615fadbc0c98ad77a70d64b77d0d
unpetrify-ref: v1.3.1
+- name: oslo-context
+ repo: upstream:openstack/oslo-context
+ ref: 1c4757a9fb41e47867bd9b8d390057ad7636b76f
+ unpetrify-ref: 0.2.0
+- name: oslo-middleware
+ repo: upstream:openstack/oslo-middleware
+ ref: bff184a2b5b1a0d3d22508a7544075378aca9e13
+ unpetrify-ref: 1.2.0
+ build-depends:
+ - oslo-context
- name: oslo-messaging
repo: upstream:openstack/oslo-messaging
- ref: 6ea3b12492e86f9e8d109fc3490cc4d3a0edd8b6
- unpetrify-ref: 1.4.0.0a5
+ ref: 562c41bb78f578ff9c27633c04ac6dd914c55f5a
+ unpetrify-ref: 1.8.2
build-depends:
- kombu
+- name: ordereddict
+ repo: upstream:python-packages/ordereddict-tarball
+ ref: 332cd0213829089dd827a32e7c5e64c41ce79cbc
+ unpetrify-ref: ordereddict-1.1
+- name: trollius
+ repo: upstream:python-packages/trollius
+ ref: fe6f8d61b1257bc01cdf4f789aaf4a8ec3d6f8ec
+ unpetrify-ref: trollius-1.0.4
+ build-depends:
+ - ordereddict
+- name: aioeventlet
+ repo: upstream:python-packages/aioeventlet
+ ref: 3cac0d7740592a380a7dadb2ddcdda000cae2bda
+ unpetrify-ref: 0.4
+ build-depends:
+ - trollius
+- name: urllib3
+ repo: upstream:python-packages/urllib3
+ ref: 8434c77d845255c4002b505c6c2d79c3b35def0d
+ unpetrify-ref: 1.10.4
+- name: oslo-concurrency
+ repo: upstream:openstack/oslo-concurrency
+ ref: a2473ed0a59e4553766ffcb1ee8f06cb98b14a48
+ unpetrify-ref: 1.8.0
+ build-depends:
+ - posix-ipc-tarball
+ - retrying
- name: oslo-vmware
repo: upstream:openstack/oslo-vmware
- ref: 047d62c4bbd01a951f77a1a4a75fb2b3d8ce23ee
- unpetrify-ref: 0.6.0
+ ref: 5de2c31e9d24f40fc7d33ddb1ce407ffdc6f366c
+ unpetrify-ref: 0.11.1
build-depends:
+ - oslo-concurrency
- suds
+ - urllib3
+ - httplib2
- name: taskflow
repo: upstream:openstack/taskflow
- ref: 1caaecc5d6b2aa4cde4a50e31d1d993fce7a66c4
- unpetrify-ref: 0.5.0
+ ref: 28bece7c7c97199b8d941b16865c3670c323589a
+ unpetrify-ref: 0.7.1
- name: sqlalchemy-migrate
repo: upstream:python-packages/sqlalchemy-migrate
- ref: 089663761cc15f8b3cdb874b6a76270ccdd0a412
- unpetrify-ref: 0.9.1
+ ref: e57ee4c3a4247c634980cbeba74d04a01253967d
+ unpetrify-ref: 0.9.6
build-depends:
- sqlalchemy
- tempita
- name: oauthlib
repo: upstream:python-packages/oauthlib
- ref: de773eefcb3c1afe54a0c12d5bf9bd214ceaf404
- unpetrify-ref: 0.6.3
+ ref: fd239fca84644896b1971cf24bc6213d065adb86
+ unpetrify-ref: 0.7.2
build-depends:
- docutils
- creole
@@ -320,31 +360,53 @@ chunks:
unpetrify-ref: 0.3.0
- name: pycadf
repo: upstream:python-packages/pycadf
- ref: 52727bcea3a98e72331e748ce5f9e3a111a64cd1
- unpetrify-ref: 0.6.0
+ ref: 9501f4f74c5d800ae43edbe52680e285cf98c710
+ unpetrify-ref: 0.9.0
+ build-depends:
+ - oslo-context
build-depends:
- oslo-messaging
- posix-ipc-tarball
- name: keystonemiddleware
repo: upstream:openstack/keystonemiddleware
- ref: a7beb50b38be5c3dd4c44d68ad79d1bb206dab6b
- unpetrify-ref: 1.2.0
+ ref: 0e63b0e13d0a7919fddd7576c99bc15a45d31a9f
+ unpetrify-ref: 1.5.1
+ build-depends:
+ - pycadf
+ - oslo-context
- name: oslo-db
repo: upstream:openstack/oslo-db
- ref: 0bb1e236daae53a3f5b4b88761d7b19f7961ed6c
- unpetrify-ref: 1.0.2
+ ref: 3e6a30c396aa42ef0eccb5b3625af728d8d3f437
+ unpetrify-ref: 1.7.1
build-depends:
- alembic
- sqlalchemy
- sqlalchemy-migrate
- name: glance_store
repo: upstream:openstack/glance_store.git
- ref: 54f673d4133c1244e2555e7ceb3344c104a74154
- unpetrify-ref: 0.1.8
+ ref: ea88e503b617a7ac9a0ae7e537d6517e9992a104
+ unpetrify-ref: 0.4.0
+ build-depends:
+ - ordereddict
+ - oslo-concurrency
+- name: oslo-log
+ repo: upstream:openstack/oslo-log
+ ref: 54e3d0e705accfaa4c73a01fc2ea1480fcc0024e
+ unpetrify-ref: 1.0.0
+ build-depends:
+ - oslo-context
+- name: oslo-policy
+ repo: upstream:openstack/oslo-policy
+ ref: 4c8f38cd1d088c46be314b47f6774e721813c6d9
+ unpetrify-ref: 0.3.2
+- name: semantic-version
+ repo: upstream:python-packages/semantic-version
+ ref: 2174bdcae6e46f5f68f5b8ea984a695db9f41bcf
+ unpetrify-ref: v2.4.1
- name: glance
repo: upstream:openstack/glance
- ref: 1db07bd8c07bbcde4bd267985c4e3961c22b990e
- unpetrify-ref: 2014.2.3
+ ref: 93b0d5fce3a41e4a3a549f98f78b6681cbc3ea95
+ unpetrify-ref: 2015.1.0
build-depends:
- sqlalchemy
- anyjson
@@ -355,20 +417,32 @@ chunks:
- keystonemiddleware
- wsme
- oslo-vmware
+ - oslo-concurrency
+ - oslo-context
+ - oslo-log
+ - oslo-policy
- paste
- oslo-db
- oslo-messaging
- retrying
- osprofiler
+ - ordereddict
- glance_store
+ - semantic-version
+ - taskflow
+ - posix-ipc-tarball
- name: sqlparse
repo: upstream:python-packages/sqlparse
ref: 991e7348075accae6d08025212251af21e92e664
unpetrify-ref: 0.1.13
+- name: pysaml2
+ repo: upstream:python-packages/pysaml2.git
+ ref: 13ff5e8899300c9b359fa1bdfdb3d412be0d7356
+ unpetrify-ref: 2.4.0
- name: keystone
repo: upstream:openstack/keystone
- ref: 91a33875385ca296d24f67d4ef9629a2b33bed99
- unpetrify-ref: 2014.2.3
+ ref: 5d3b31f9c3d34599ff8a83eeb7530fc6e0b1b67b
+ unpetrify-ref: 2015.1.0
build-depends:
- paste
- routes
@@ -376,30 +450,38 @@ chunks:
- sqlalchemy-migrate
- passlib
- keystonemiddleware
+ - oslo-concurrency
- oslo-messaging
- oslo-db
+ - oslo-log
+ - oslo-middleware
+ - oslo-policy
- oauthlib
- dogpile-cache
- pycadf
- posix-ipc-tarball
- - sqlparse
+ - pysaml2
- name: neutron
morph: strata/openstack-services/neutron.morph
repo: upstream:openstack/neutron
- ref: 96b5962646510ee67b322aa82242e02e3edfaa83
- unpetrify-ref: 2014.2.3
+ ref: 7260e0e3fc2ea479e80e0962624aca7fd38a1f60
+ unpetrify-ref: 2015.1.0
build-depends:
- paste
- routes
- - anyjson
- httplib2
- jsonrpclib
- keystonemiddleware
- sqlalchemy
- alembic
+ - retrying
- oslo-db
- oslo-messaging
- oslo-rootwrap
+ - oslo-concurrency
+ - oslo-context
+ - oslo-log
+ - oslo-middleware
- name: wsgiref
repo: upstream:python-packages/wsgiref.git
ref: e8360785eef259394e13b2062407edc3c2cbc1e0
@@ -435,120 +517,144 @@ chunks:
- name: nova
morph: strata/openstack-services/nova.morph
repo: upstream:openstack/nova
- ref: e6452b995023e89bf6f1a1fb14f39216f83c760b
- unpetrify-ref: 2014.2.3
+ ref: 8397b6464af520903f546ce4c6d51a2eb5b4c8a8
+ unpetrify-ref: 2015.1.0
build-depends:
- sqlalchemy
- - anyjson
- keystonemiddleware
- - kombu
- routes
- paste
- sqlalchemy-migrate
- - suds
- - posix-ipc-tarball
- websockify
- - wsgiref
- oslo-db
- oslo-rootwrap
- - pycadf
- oslo-messaging
- - lockfile
- rfc3986
- - oslo-vmware
+ - oslo-concurrency
+ - oslo-context
+ - oslo-log
+ - oslo-messaging
- name: cinder
morph: strata/openstack-services/cinder.morph
repo: upstream:openstack/cinder
- ref: 48c792513fd342a5f82122b12e4ed2afd0de2ae7
- unpetrify-ref: 2014.2.3
+ ref: 5987bb2290f629e59b0bcced2f8fe22cdeb9cc6d
+ unpetrify-ref: 2015.1.0
build-depends:
- anyjson
- keystonemiddleware
- kombu
+ - oslo-concurrency
+ - oslo-context
- oslo-db
+ - oslo-log
- oslo-messaging
+ - oslo-middleware
- oslo-rootwrap
- osprofiler
- paste
+ - retrying
- routes
- taskflow
- rtslib-fb
- sqlalchemy
- sqlalchemy-migrate
- suds
- - wsgiref
+ - oslo-vmware
- name: pymemcache
- repo: upstream:python-packages/pymemcache.git
- ref: 3824d3b0bcdea3e8d0c08598bedfce10fd3c79e0
- unpetrify-ref: master
+ repo: upstream:python-packages/pymemcache
+ ref: 0646937c2bfebdb557ec2c01f0e42a9af79ad49d
+ unpetrify-ref: v1.2.9
- name: sysv_ipc-tarball
repo: upstream:python-packages/sysv-ipc-tarball.git
ref: a77e3a63f004e6ee789fa05e4a5bbc333b1529f1
unpetrify-ref: sysv_ipc-0.6.8
+- name: redis-py
+ repo: upstream:python-packages/redis-py
+ ref: 4d0b0afe9c9a431ed50c3e9fb95a0aa88b1f1038
+ unpetrify-ref: 2.10.3
- name: tooz
- repo: upstream:python-packages/tooz.git
- ref: a90940a506b7c1bf52ef7d2f2ff52204fdcc6221
- unpetrify-ref: 0.7
+ repo: upstream:python-packages/tooz
+ ref: 8086661f404e61c22f0dd1d07b57a864862a0869
+ unpetrify-ref: 0.13.2
build-depends:
- pymemcache
- - sysv_ipc-tarball
- msgpack-python
- retrying
+ - redis-py
+- name: kafka-python
+ repo: upstream:python-packages/kafka-python
+ ref: 8675c3e3e620df5ba9fd7e570c554b773429bd78
+ unpetrify-ref: v0.9.3
+- name: werkzeug
+ repo: upstream:python-packages/werkzeug
+ ref: 96e49709d627a7766077cff4c98ebf3cad868ceb
+ unpetrify-ref: v0.10.4
- name: ceilometer
repo: upstream:openstack/ceilometer
morph: strata/openstack-services/ceilometer.morph
- ref: 720c2b4915caf5decd3da91ea2d6e6291316b940
- unpetrify-ref: 2014.2.3
+ ref: b0447ed8e7bee371bf7095c86e47d717abe89edc
+ unpetrify-ref: 2014.1.0
build-depends:
+ - retrying
- alembic
- - anyjson
- croniter
- - happybase
- jsonpath-rw
+ - kafka-python
- keystonemiddleware
- - lockfile
- msgpack-python
+ - oslo-context
- oslo-db
+ - oslo-concurrency
+ - oslo-policy
- oslo-rootwrap
- - oslo-vmware
- pecan
- posix-ipc-tarball
- oslo-messaging
+ - oslo-middleware
- pysnmp
- sqlalchemy
- sqlalchemy-migrate
- tooz
+ - werkzeug
- wsme
- name: django-openstack-auth
repo: upstream:openstack/django_openstack_auth
- ref: e676c88a329af57d6c4f13df54f6e1e06c1f8360
- unpetrify-ref: 1.1.8
+ ref: 0e1f7b78277850634992a594132921efb83256e0
+ unpetrify-ref: 1.2.0
+- name: pint
+ repo: upstream:python-packages/pint
+ ref: e7e7de5ca2e1c19963be8a918369fb19186f9a73
+ unpetrify-ref: 0.6
- name: horizon
morph: strata/openstack-services/horizon.morph
repo: upstream:openstack/horizon
- ref: b37c1f3565e89a7fe3fef5ce76e9c26b22e3e7c4
- unpetrify-ref: 2014.2.3
+ ref: b99cf48ff346494198fb9740495eacc14fa406bf
+ unpetrify-ref: 2015.1.0
build-depends:
+ - pint
- django-openstack-auth
- - lockfile
+ - kombu
+ - oslo-concurrency
- name: novnc
morph: strata/openstack-services/novnc.morph
repo: upstream:novnc
ref: 97be997f62d59c028fc45323b00e3b93fafe4eb4
unpetrify-ref: baserock/v0.5.1
-- name: oauth
- repo: upstream:python-packages/oauthlib
- ref: fd239fca84644896b1971cf24bc6213d065adb86
- unpetrify-ref: 0.072
- name: pyserial
repo: upstream:python-packages/pyserial
ref: bcfc1ec2fdb9a8c9c867481d7673e85fe512e667
unpetrify-ref: release2_7
+- name: tempest-lib
+ repo: upstream:openstack/tempest-lib
+ ref: c307ffc525d896e2071319c8067aec805804f92b
+ unpetrify-ref: 0.5.0
- name: tempest
morph: strata/openstack-services/tempest.morph
- repo: upstream:openstack/tempest.git
- ref: acba5510785258949679304f3e1a55e53b851962
- unpetrify-ref: "2"
+ repo: upstream:openstack/tempest
+ ref: 26149b612d01ad605e4d0f41a2d67280c8088cda
+ unpetrify-ref: "4"
+ build-depends:
+ - tempest-lib
- name: tftp-hpa
morph: strata/openstack-services/tftp-hpa.morph
repo: upstream:tftp-hpa
@@ -559,7 +665,7 @@ chunks:
repo: upstream:python-packages/singledispatch
ref: 92175ba65602a03086d2b1f770f45d88af93fc3e
unpetrify-ref: 3.4.0.3
-- name: pysinglefile
+- name: pysendfile
morph: strata/openstack-services/pysendfile.morph
repo: upstream:python-packages/pysendfile
ref: 6775b2938ef74255239c8e08458369921297b311
@@ -567,5 +673,22 @@ chunks:
- name: ironic
morph: strata/openstack-services/ironic.morph
repo: upstream:openstack/ironic
- ref: 0f4d454bf2093d3d62460f88aa9288bee3286b38
- unpetrify-ref: stable/juno
+ ref: dee609cb7976e9b3cc07c3d342a271c4a347f69f
+ unpetrify-ref: 2015.1.0
+ build-depends:
+ - sqlalchemy
+ - alembic
+ - sqlalchemy-migrate
+ - pysendfile
+ - websockify
+ - oslo-concurrency
+ - oslo-context
+ - oslo-db
+ - oslo-rootwrap
+ - oslo-policy
+ - pecan
+ - wsme
+ - keystonemiddleware
+ - oslo-messaging
+ - retrying
+ - posix-ipc-tarball
diff --git a/strata/python-common.morph b/strata/python-common.morph
index e724d91..d329dc4 100644
--- a/strata/python-common.morph
+++ b/strata/python-common.morph
@@ -42,8 +42,8 @@ chunks:
- python-json-pointer
- name: python-prettytable
repo: upstream:python-prettytable
- ref: 7a48f1e84049577370cf28632a75d2fd01e4142d
- unpetrify-ref: master
+ ref: bea6a50e4da00074b35b57232771cea58b89b3e0
+ unpetrify-ref: 0.7.2-RELEASE
- name: configobj
repo: upstream:configobj-git
ref: 9d2aab01c77dce600b296ba9da1163cc0bbc14e0
diff --git a/strata/swift.morph b/strata/swift.morph
index 22ca8a3..756c277 100644
--- a/strata/swift.morph
+++ b/strata/swift.morph
@@ -3,27 +3,45 @@ kind: stratum
description: Distributed object storage
build-depends:
# openstack-common is required for simplejson, cffi, greenlet,
-# eventlet, pastedeploy
+# eventlet, pastedeploy, netifaces
- morph: strata/openstack-common.morph
chunks:
- name: dnspython
repo: upstream:python-packages/dnspython
ref: e1369c62d14f82b80ef11197a490ace5d43bb3f3
unpetrify-ref: v1.12.0
-- name: netifaces
- repo: upstream:python-packages/netifaces
- ref: 885b200ba717df87f6e8044ec8c66c677c949bcb
- unpetrify-ref: release_0_10_4
- name: xattr
morph: strata/swift/xattr.morph
repo: upstream:python-packages/xattr
ref: dd10d44e3eb9a1d2303c1f7d5126c099d56e97fc
unpetrify-ref: v0.7.6
+- name: liberasurecode
+ repo: upstream:liberasurecode
+ ref: a380246762c16ea8eb7dbfccd50d296c3743b39e
+ unpetrify-ref: v1.0.7
+- name: gf-complete
+ repo: upstream:gf-complete
+ ref: 715443661c00558fe32f004a4be5f93f341b6e59
+ unpetrify-ref: v2
+- name: jerasure
+ repo: upstream:jerasure
+ ref: ff7032153ea230fb59596f1f8a0e9ad8653addfb
+ unpetrify-ref: v2
+ build-depends:
+ - gf-complete
+- name: pyeclib
+ repo: upstream:python-packages/pyeclib
+ ref: aa58aa887c2327e1394d6f28b3b6b7ab8f190b2b
+ unpetrify-ref: v1.0.7
+ build-depends:
+ - liberasurecode
+ - gf-complete
+ - jerasure
- name: swift
repo: upstream:openstack/swift
- ref: 2e8261a4dc0d0af0c4a46478b81e167bcf02220b
- unpetrify-ref: 2.2.0
+ ref: f8dee761bd36f857aa1288c27e095907032fad68
+ unpetrify-ref: 2.3.0
build-depends:
- dnspython
- - netifaces
- xattr
+ - pyeclib
diff --git a/strata/test-tools.morph b/strata/test-tools.morph
index 6826c96..7754e91 100644
--- a/strata/test-tools.morph
+++ b/strata/test-tools.morph
@@ -48,8 +48,10 @@ chunks:
- testtools
- name: testscenarios
repo: upstream:python-packages/testscenarios
- ref: 475857af19a8190c9c0c7f8241b9907b942e19fd
+ ref: bccfaa71a2def5590161b6d1a247cf23c45a8b4d
unpetrify-ref: trunk
+ build-depends:
+ - testtools
- name: mox
repo: upstream:python-packages/mox
ref: 160491d0384285698d726b1af21277f336107f51
@@ -79,9 +81,9 @@ chunks:
ref: f7f87e4ac1c52342162cf2035f5fe3d273f8b07f
unpetrify-ref: master
- name: zake
- repo: upstream:python-packages/zake.git
- ref: 13b92d9db4ad37d9550ef5c5abd323a2530a1e72
- unpetrify-ref: master
+ repo: upstream:python-packages/zake
+ ref: 436bab3306aeec420f1281f34bd5d26d7f81038c
+ unpetrify-ref: 0.2.1
build-depends:
- testtools
- name: nose
diff --git a/strata/xstatic.morph b/strata/xstatic.morph
index bf21a29..0b400df 100644
--- a/strata/xstatic.morph
+++ b/strata/xstatic.morph
@@ -26,8 +26,12 @@ chunks:
unpetrify-ref: master
- name: xstatic-angular-bootstrap
repo: upstream:xstatic-packages/xstatic-angular-bootstrap
- ref: 2a8c157b8b0733afbfdaf7eea29cf012a8b7f483
- unpetrify-ref: master
+ ref: b581edb6975175a564fd02766aef2f9043702c80
+ unpetrify-ref: 0.11.0.3
+- name: xstatic-angular-lrdragndrop
+ repo: upstream:xstatic-packages/xstatic-angular-lrdragndrop
+ ref: 55c7494492e6da2a6664aa00941864dd64589396
+ unpetrify-ref: 1.0.2.3
- name: xstatic-angular-cookies
repo: upstream:xstatic-packages/xstatic-angular-cookies
ref: 66141a33ae7ad84b82ba9384a8101ae15ccd6da5
@@ -54,8 +58,8 @@ chunks:
unpetrify-ref: master
- name: xstatic-bootstrap-scss
repo: upstream:xstatic-packages/xstatic-bootstrap-scss
- ref: e8ca8e38e464691268faec8cd6ae59777ee7ee9e
- unpetrify-ref: master
+ ref: d81b7b71c6c088406e90d1bdba0e10f0a304bbdc
+ unpetrify-ref: 3.1.1.1
- name: xstatic-d3
repo: upstream:xstatic-packages/xstatic-d3
ref: 1e754e73c801fb9315995ffeb95ae51233c4fcaf
@@ -96,6 +100,10 @@ chunks:
repo: upstream:xstatic-packages/xstatic-jquery-ui
ref: b494369430dafd8ac4ddbe90efb9f8ad20a6e6d1
unpetrify-ref: 1.11.0.1
+- name: xstatic-magic-search
+ repo: upstream:xstatic-packages/xstatic-magic-search
+ ref: 60d6954a36e54afa1f925324e7b527d235bdb484
+ unpetrify-ref: 0.2.0.1
- name: xstatic-jsencrypt
repo: upstream:xstatic-packages/xstatic-jsencrypt
ref: 5c0f088310ecd602e3aaf5e683385b0d27258409
@@ -112,3 +120,7 @@ chunks:
repo: upstream:xstatic-packages/xstatic-spin
ref: 74b4c0d0ff12db1f84787246857d5e925ff6883f
unpetrify-ref: master
+- name: xstatic-termjs
+ repo: upstream:xstatic-packages/xstatic-termjs
+ ref: a4ac0b809ab0d84c636a760215839bb6d68d0113
+ unpetrify-ref: master