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-05-21 14:09:48 (GMT)
commit2743058c9427d7efa1c2931ff63d74ea2e0a3af6 (patch)
tree5645c561b30421d0cc64d603279e9676cc436eb3
parent244e16c16aa11852706a7ab51cf6dd216e3315a8 (diff)
downloaddefinitions-2743058c9427d7efa1c2931ff63d74ea2e0a3af6.tar.gz
Upgrade glance to 2015.1.0 (Kilo), and dependencies
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 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 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.
-rw-r--r--strata/openstack-clients.morph4
-rw-r--r--strata/openstack-common.morph30
-rw-r--r--strata/openstack-services.morph122
-rw-r--r--strata/python-common.morph4
-rw-r--r--strata/swift.morph7
-rw-r--r--strata/test-tools.morph4
6 files changed, 122 insertions, 49 deletions
diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph
index 32e0f35..c5b9308 100644
--- a/strata/openstack-clients.morph
+++ b/strata/openstack-clients.morph
@@ -10,8 +10,8 @@ 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
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 4a512e1..49cec66 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -42,8 +42,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
@@ -54,8 +54,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
@@ -186,13 +186,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
@@ -270,26 +270,66 @@ 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
@@ -315,31 +355,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
@@ -350,12 +412,20 @@ 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
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..5295b6a 100644
--- a/strata/swift.morph
+++ b/strata/swift.morph
@@ -3,17 +3,13 @@ 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
@@ -25,5 +21,4 @@ chunks:
unpetrify-ref: 2.2.0
build-depends:
- dnspython
- - netifaces
- xattr
diff --git a/strata/test-tools.morph b/strata/test-tools.morph
index 6826c96..ca87b29 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: 10978cc9ae808202cf7c4b96adb1965056e4a0c6
unpetrify-ref: trunk
+ build-depends:
+ - testtools
- name: mox
repo: upstream:python-packages/mox
ref: 160491d0384285698d726b1af21277f336107f51