Firehose test commit

1 files changed, 309 insertions, 333 deletions

diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index aa73fa33..518e8d60 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -6,7 +6,14 @@ build-depends:
 - morph: strata/django.morph
 - morph: strata/xstatic.morph
 - morph: strata/openstack-clients.morph
+- morph: strata/test-tools.morph
+- morph: strata/python-tools.morph
 chunks:
+- name: erlang-sd_notify
+  morph: strata/openstack-services/erlang-sd_notify.morph
+  repo: upstream:erlang-modules/erlang-sd_notify
+  ref: 99f4689c2c18570680329f822591f95f9341ca10
+  unpretrify-ref: 0.1
 - name: rabbitmq-codegen
   morph: strata/openstack-services/rabbitmq-codegen.morph
   ref: 4dc5ccde2a0b3d638e5754b00abf94196fe9ca32
@@ -21,38 +28,18 @@ chunks:
   - rabbitmq-codegen
 - name: oslo-rootwrap
   repo: upstream:openstack/oslo-rootwrap
-  ref: 62d732277de5cf663172eafe6d3a6c149a9cf814
-  unpetrify-ref: master
-- name: check
-  repo: upstream:check
-  ref: 8c872aca6675e95fa47e7514e28fbdf25fce6170
-  unpetrify-ref: 0.9.8
-- name: cppunit
-  repo: upstream:cppunit
-  ref: 8133cf2b977f013216f0a41b6fcb740410d83926
-  unpetrify-ref: 1.13.2
-- name: webob
-  repo: upstream:python-packages/webob
-  ref: ae0ac90f22f9e1ff351e445f92330efd89195f51
-  unpetrify-ref: 1.4
-- name: greenlet
-  ref: 42b65a7b67dfabd180625155cd4fcd8e51917fe2
-  unpetrify-ref: 0.4.5
-  repo: upstream:python-packages/greenlet
-- name: eventlet
-  ref: 8d2474197de4827a7bca9c33e71a82573b6fc721
-  unpetrify-ref: v0.15.2
-  repo: upstream:python-packages/eventlet
-  build-depends:
-  - greenlet
+  ref: f485b93f475b119e3b8fa6c9cf740207e2d2d7ac
+  unpetrify-ref: 1.6.0
+  build-system: python-distutils
 - name: py-amqp
   repo: upstream:python-packages/py-amqp
   ref: 875b10d1715def640042c7ff2f42c00a6c07eed1
   unpetrify-ref: 1.4.6
+  build-system: python-distutils
 - name: librabbitmq
   morph: strata/openstack-services/librabbitmq.morph
   repo: upstream:python-packages/librabbitmq
-  ref: 0087f3c6fa81d4ec4c573319ee2149a5db7018e6
+  ref: ecccbd2c7d92f6e189e362b26def8d980fa50e3b
   unpetrify-ref: baserock/v1.6.1
   build-depends:
   - py-amqp
@@ -60,10 +47,12 @@ chunks:
   repo: upstream:python-packages/anyjson
   ref: 016506078e94718e1fe750eb5083ab5ba07498c8
   unpetrify-ref: 0.3.3
+  build-system: python-distutils
 - name: kombu
   repo: upstream:python-packages/kombu
-  ref: 6e68e54b3a846faa6f8b7e14a4a7ca51d1967bc2
-  unpetrify-ref: v3.0.23
+  ref: 0287b11ab0698d9c52ef1b1683ced23123d43ba4
+  unpetrify-ref: v3.0.26
+  build-system: python-distutils
   build-depends:
   - anyjson
   - py-amqp
@@ -72,99 +61,85 @@ chunks:
   repo: upstream:python-packages/sqlalchemy
   ref: ff34c480dfd2b8b7c72339d196f5477980a5124c
   unpetrify-ref: rel_0_9_8
+  build-system: python-distutils
 - name: alembic
   repo: upstream:python-packages/alembic
-  ref: 5f952f25caa688d89204d134ee867de7dbad917c
-  unpetrify-ref: rel_0_7_1
+  ref: 6ae4196acc0170ebef29f617b49376b371a8923c
+  unpetrify-ref: rel_0_7_6
+  build-system: python-distutils
   build-depends:
   - sqlalchemy
 - name: lockfile
   repo: upstream:python-packages/lockfile
   ref: 777758cdf4520271370b3338b86b5c66f9b104f0
   unpetrify-ref: master
+  build-system: python-distutils
 - name: dogpile-core
   repo: upstream:python-packages/dogpile-core
   ref: 3e6f0f86b4161b48898e656039154092426e5cc8
   unpetrify-ref: rel_0_4_1
+  build-system: python-distutils
 - name: dogpile-cache
   repo: upstream:python-packages/dogpile-cache
   ref: 1c753914b335b4391bc5847a87b7c52ca81c2bc6
   unpetrify-ref: rel_0_5_4
+  build-system: python-distutils
   build-depends:
   - dogpile-core
 - name: pyjwt
   repo: upstream:python-packages/pyjwt
   ref: 739efeff4c6c1fc30ab5cf5eb0ac337e8ee107d7
   unpetrify-ref: 0.2.3
+  build-system: python-distutils
 - name: creole
   repo: upstream:python-packages/creole
   ref: 6390231688adb5d8678a71cd33204e9bca555d4a
   unpetrify-ref: v1.2.1
-- name: mock
-  repo: upstream:python-packages/mock
-  ref: 35b35f7ad239005a950f870af57b44dbdc99d66b
-  unpetrify-ref: master
-- name: nose
-  repo: upstream:python-packages/nose
-  ref: 08d134270b035dac3310cd877bb0fe9ab678303a
-  unpetrify-ref: release_1.3.4
+  build-system: python-distutils
 - name: pygments
   repo: upstream:python-packages/pygments
   ref: f41e8c594e76855611b3b3dfca300894bd29f1c4
   unpetrify-ref: 2.0rc1
+  build-system: python-distutils
 - name: docutils
   repo: upstream:python-packages/docutils
   ref: 1976ba91eff979abc3e13e5d8cb68324833af6a0
   unpetrify-ref: docutils-0.12
+  build-system: python-distutils
 - name: snowballstemmer
   repo: upstream:python-packages/snowballstemmer.git
   ref: f0d81ce1606d685029302ea073b59d9437d12569
   unpetrify-ref: master
+  build-system: python-distutils
 - name: sphinx
   repo: upstream:python-packages/sphinx
   ref: e76c9771bad16e68cdb7deb18b4d13de0a718c68
   unpetrify-ref: 1.3b1
+  build-system: python-distutils
   build-depends:
   - pygments
   - docutils
   - snowballstemmer
-- name: logilab-common
-  repo: upstream:python-packages/logilab-common.git
-  ref: d1d8f793af6d015d885b9ea67b5741d5a093e2f4
-  unpetrify-ref: logilab-common-version-0.62.0
-- name: astroid
-  repo: upstream:python-packages/astroid.git
-  ref: 7657331baa162122890aa4327f4f441cde9f5188
-  unpetrify-ref: astroid-1.2.1
-  build-depends:
-  - logilab-common
-- name: pylint
-  repo: upstream:python-packages/pylint
-  ref: 541466c31aae21c7cfbf30470f0f6a2dc0a948c3
-  unpetrify-ref: pylint-1.3.1
-  build-depends:
-  - logilab-common
-  - astroid
-- name: python-markdown
-  repo: upstream:python-markdown
-  ref: f0c5b71acbc02af60a33d67c59558bb513b25e74
-  unpetrify-ref: 2.5.1-final
 - name: pystache
   repo: upstream:python-packages/pystache.git
-  ref: 0c5e61a4ccc05bde7f6c6132b4fb6c49a3c093fd
+  ref: cce3ebd658f28aeb7dd54561554dedf5259303dc
   unpetrify-ref: baserock/v0.5.4
+  build-system: python-distutils
 - name: pies
   repo: upstream:python-packages/pies.git
   ref: 593dcce07fdb3e8d0053a863a7aba7f2ce8a6c9c
   unpetrify-ref: 2.6.1
+  build-system: python-distutils
 - name: natsort
   repo: upstream:python-packages/natsort.git
   ref: ce94d418c3849e891f0508b41f5bccc4ae1d4e4d
   unpetrify-ref: 3.5.1
+  build-system: python-distutils
 - name: isort
   repo: upstream:python-packages/isort.git
   ref: 9d1b03b6e1fd2f87be1c635d6159a76a131f8155
   unpetrify-ref: 3.9.0
+  build-system: python-distutils
   build-depends:
   - pies
   - natsort
@@ -172,218 +147,152 @@ chunks:
   repo: upstream:python-packages/pep8.git
   ref: 164066c4d85f212f5f4a11699b848942c678b947
   unpetrify-ref: 1.5.7
+  build-system: python-distutils
 - name: pyflakes
   repo: upstream:python-packages/pyflakes.git
   ref: 71b7b6776856912d50a0b9a85a8ea2a1dc7eb75c
   unpetrify-ref: 0.8.1
+  build-system: python-distutils
 - name: smartypants
   repo: upstream:python-packages/smartypants.git
   ref: e89b6e7e119694edcd414a556c634d5ca85bff76
   unpetrify-ref: v1.8.6
+  build-system: python-distutils
   build-depends:
   - isort
   - pep8
   - pyflakes
-  - pylint
 - name: pycco
   repo: upstream:python-packages/pycco
   ref: 22e157e525760e843dba391ca85fbe9bd35fdc5b
   unpetrify-ref: master
+  build-system: python-distutils
   build-depends:
-  - python-markdown
   - pygments
   - pystache
   - smartypants
-- name: python-decorator
-  repo: upstream:python-packages/python-decorator
-  ref: b02f7a254c3679dfac57a824e08dd02ced850636
-  unpetrify-ref: decorator-3.4.0
 - name: dateutil
   repo: upstream:python-packages/dateutil
   ref: 8c6026ba09716a4e164f5420120bfe2ebb2d9d82
   unpetrify-ref: trunk
+  build-system: python-distutils
 - name: posix-ipc-tarball
   repo: upstream:python-packages/posix-ipc-tarball
   ref: f3765db04b903b3671733e07cf1541a51966dd14
   unpetrify-ref: posix_ipc-0.9.8
-- name: pastedeploy
-  repo: upstream:python-packages/pastedeploy
-  ref: 5ad87be617c2cc1dd31625688172e964db2756dc
-  unpetrify-ref: 1.5.2
+  build-system: python-distutils
 - name: paste
   repo: upstream:python-packages/paste
   ref: 4c177fce89fee925f0f4fbfde00ce2e1252562c0
   unpetrify-ref: master
+  build-system: python-distutils
 - name: repoze-lru
   repo: upstream:python-packages/repoze-lru
   ref: 29c8281dee7fe8dae8c66c7c40ce7c058ec2ab0f
   unpetrify-ref: 0.6
+  build-system: python-distutils
 - name: routes
   repo: upstream:python-packages/routes
-  ref: 8b165a52ab568f6fcaaa11cbbc7402e0360f60a3
-  unpetrify-ref: v2.0
+  ref: 745a9207d9e48e309e292172543bc21075e65e09
+  unpetrify-ref: v2.1
+  build-system: python-distutils
   build-depends:
   - repoze-lru
 - name: passlib
   repo: upstream:python-packages/passlib
   ref: f407312597727a08440e41bc8e31d3b3b334c66f
   unpetrify-ref: 1.6.2
+  build-system: python-distutils
 - name: tempita
   repo: upstream:python-packages/tempita
   ref: b2b67795a009e9f825cbd855d766b78a00273f10
   unpetrify-ref: 0.5
+  build-system: python-distutils
 - name: numpy
   repo: upstream:python-packages/numpy.git
-  ref: ac07f6d3e45090b224a7da81708e60a762a65f76
+  ref: 65293874fb101907e1648e6b4fafd30d0aa1172a
   unpetrify-ref: baserock/v1.9.0
+  build-system: python-distutils
   build-depends:
   - sphinx
 - name: websockify
   repo: upstream:python-packages/websockify
-  ref: e0863aa0c2103069961bc24e618615a0f2bb1487
-  unpetrify-ref: baserock/v0.6.0
+  ref: 2f025741f86419d4ad5702dabf5903db3dbfe77c
+  unpetrify-ref: baserock/v0.6.1-1-g2f02574
+  build-system: python-distutils
   build-depends:
   - numpy
-- name: python-mimeparse
-  repo: upstream:python-packages/python-mimeparse.git
-  ref: 2d600d3fc4a386af69d20fba433843b4df2b3c92
-  unpetrify-ref: master
 - name: httplib2
-  ref: 058a1f9448d5c27c23772796f83a596caf9188e6
-  unpetrify-ref: v0.9
   repo: upstream:python-packages/httplib2
-- name: extras
-  repo: upstream:python-packages/python-test-extras.git
-  ref: cdeb596f01241e9c779332e86f6edcd0c2e8e9f0
-  unpetrify-ref: master
-- name: testtools
-  repo: upstream:python-packages/testtools
-  ref: ee9946228ce5a03a84cf146027de0a8a9a46c4fe
-  unpetrify-ref: testools-1.1.0
-  build-depends:
-  - extras
-  - python-mimeparse
-- name: fixtures
-  repo: upstream:python-packages/fixtures
-  ref: 9f9d89ce718463b24cd3910b9a99efb60b3c9e1b
-  unpetrify-ref: 0.3.16
-  build-depends:
-  - testtools
-- name: subunit
-  morph: strata/openstack-services/subunit.morph
-  repo: upstream:python-packages/subunit
-  ref: e18ffe65a3229d5c1d91be988405d40219db0887
-  unpetrify-ref: 0.0.21
-  build-depends:
-  - extras
-  - testtools
-  - check
-  - cppunit
-- name: testrepository
-  repo: upstream:python-packages/testrepository
-  ref: 6419a3dcaabaf09eaf438c6d8d85c90eba7a2b91
-  unpetrify-ref: 0.0.19
-  build-depends:
-  - fixtures
-  - subunit
-  - testtools
+  ref: f9f797223d075874b0031aea832152688ec23fef
+  unpetrify-ref: v0.9.1
+  build-system: python-distutils
 - name: suds
   repo: upstream:python-packages/suds
-  ref: badd30a87f676d632d7386b05401e6029a5df83c
-  unpetrify-ref: release-0.3.2
-- name: testscenarios
-  repo: upstream:python-packages/testscenarios
-  ref: 475857af19a8190c9c0c7f8241b9907b942e19fd
-  unpetrify-ref: trunk
-- name: mox
-  repo: upstream:python-packages/mox
-  ref: 160491d0384285698d726b1af21277f336107f51
-  unpetrify-ref: master
+  ref: e7a317f1a20a4d3c86ac85785bb32d24c3d1078f
+  unpetrify-ref: baserock/release-0.4
+  build-system: python-distutils
 - name: jsonrpclib
   repo: upstream:python-packages/jsonrpclib
   ref: 53c8ffcfe4dd1718086cc551dce8ac459e8abc67
   unpetrify-ref: master
+  build-system: python-distutils
 - name: rtslib-fb
   repo: upstream:python-packages/rtslib-fb
   ref: 8ffb4739d596fb1aac5d62d173d1e6f80270af9d
   unpetrify-ref: v2.1.fb52
   morph: strata/openstack-services/rtslib-fb.morph
-- name: netifaces
-  repo: upstream:python-packages/netifaces
-  ref: 885b200ba717df87f6e8044ec8c66c677c949bcb
-  unpetrify-ref: release_0_10_4
-- name: networkx
-  repo: upstream:python-packages/networkx
-  ref: 8ac796aba866ade1a56b83e30f25ed392ca3512c
-  unpetrify-ref: v1.9.1
-  build-depends:
-  - python-decorator
-- name: dnspython
-  repo: upstream:python-packages/dnspython
-  ref: e1369c62d14f82b80ef11197a490ace5d43bb3f3
-  unpetrify-ref: v1.12.0
-- name: pexpect
+- name: python-pexpect
   repo: upstream:python-packages/pexpect
   ref: 671417beb41c21f772687c565196fdde444b053b
   unpetrify-ref: 3.3
+  build-system: python-distutils
 - name: ply
   repo: upstream:python-packages/ply.git
   ref: 6513f3537d80f483ec9c7e36d52e87f107a57f23
   unpetrify-ref: master
+  build-system: python-distutils
 - name: jsonpath-rw
   repo: upstream:python-packages/jsonpath-rw
   ref: f4cfe56b8e8370116c5275ddcea970e9a68fd75d
   unpetrify-ref: 1.2.3
+  build-system: python-distutils
   build-depends:
   - ply
-  - python-decorator
-- name: waitress
-  repo: upstream:python-packages/waitress.git
-  ref: b795d573a5a9e6e39b46a6e82da367a6a5db8dbd
-  unpetrify-ref: 0.8.9
-- name: beautifulsoup4
-  repo: upstream:python-packages/beautifulsoup4.git
-  ref: bcd7af0e9159d97aa511fb2d879424d1c1c5aadf
-  unpetrify-ref: trunk
-- name: webtest
-  repo: upstream:python-packages/webtest.git
-  ref: 6a24fba456d1c4ac2609b90f1fdc377c595608a4
-  unpetrify-ref: 2.0.16
-  build-depends:
-  - webob
-  - waitress
-  - beautifulsoup4
 - name: logutils
   repo: upstream:python-packages/logutils.git
   ref: 095f14efbaaf838b7772bffd36a466abb9668efe
   unpetrify-ref: 0.3.3
+  build-system: python-distutils
 - name: pecan
   repo: upstream:python-packages/pecan
   ref: c7f241fd6bb8a0b10e02b8b43aaf1810c312cfbf
   unpetrify-ref: 0.8.0
+  build-system: python-distutils
   build-depends:
-  - webob
-  - webtest
   - logutils
 - name: croniter
   repo: upstream:python-packages/croniter
   ref: 0c3aeac05791cb4ece9e30da29442e9cd5b22f36
   unpetrify-ref: 0.3.5
+  build-system: python-distutils
   build-depends:
   - dateutil
 - name: msgpack-python
   repo: upstream:python-packages/msgpack-python
   ref: 61bac2f586e82313a0e618093bfed2435cd18983
   unpetrify-ref: 0.4.2
+  build-system: python-distutils
 - name: qpid-python
   morph: strata/openstack-services/qpid-python.morph
   repo: upstream:python-packages/qpid-python
   ref: 587b0febaf1996db1e483137ed6addb45580ee9e
-  unpetrify-ref: 0.30
+  unpetrify-ref: '0.30'
 - name: simplegeneric-tarball
   repo: upstream:python-packages/simplegeneric-tarball
   ref: 601fab9b154c557dfd848d531a8969f4697d1aa2
   unpetrify-ref: simplegeneric_0.8.1.orig
+  build-system: python-distutils
 - name: ipaddr-py
   morph: strata/openstack-services/ipaddr-py.morph
   ref: c813f4790d1092b1515ee18fe8270180ed3cc5cb
@@ -393,14 +302,15 @@ chunks:
   repo: upstream:python-packages/wsme
   ref: 99d7668789cc6252398222549599d1363cddb081
   unpetrify-ref: 0.6.1
+  build-system: python-distutils
   build-depends:
   - ipaddr-py
   - simplegeneric-tarball
-  - webob
 - name: pysnmp
   repo: upstream:python-packages/pysnmp
   ref: 1b377afeaf9ee96ab1d48aeebb2b7a6d65a4ac9d
   unpetrify-ref: release_4_2_5_tag
+  build-system: python-distutils
 - name: thrift
   morph: strata/openstack-services/thrift.morph
   repo: upstream:thrift
@@ -410,210 +320,263 @@ chunks:
   repo: upstream:python-packages/retrying
   ref: cab083eb5791615fadbc0c98ad77a70d64b77d0d
   unpetrify-ref: v1.3.1
-- name: boto
-  repo: upstream:boto
-  ref: 2517f660f8ef9012708d46da3a36ab967993d2f6
-  unpetrify-ref: 2.33.0
+  build-system: python-distutils
+- name: oslo-context
+  repo: upstream:openstack/oslo-context
+  ref: 1c4757a9fb41e47867bd9b8d390057ad7636b76f
+  unpetrify-ref: 0.2.0
+  build-system: python-distutils
+- name: oslo-middleware
+  repo: upstream:openstack/oslo-middleware
+  ref: bff184a2b5b1a0d3d22508a7544075378aca9e13
+  unpetrify-ref: 1.2.0
+  build-system: python-distutils
+  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-system: python-distutils
   build-depends:
-  - eventlet
   - kombu
+- name: ordereddict
+  repo: upstream:python-packages/ordereddict-tarball
+  ref: 332cd0213829089dd827a32e7c5e64c41ce79cbc
+  unpetrify-ref: ordereddict-1.1
+  build-system: python-distutils
+- name: trollius
+  repo: upstream:python-packages/trollius
+  ref: fe6f8d61b1257bc01cdf4f789aaf4a8ec3d6f8ec
+  unpetrify-ref: trollius-1.0.4
+  build-system: python-distutils
+  build-depends:
+  - ordereddict
+- name: aioeventlet
+  repo: upstream:python-packages/aioeventlet
+  ref: 3cac0d7740592a380a7dadb2ddcdda000cae2bda
+  unpetrify-ref: 0.4
+  build-system: python-distutils
+  build-depends:
+  - trollius
+- name: urllib3
+  repo: upstream:python-packages/urllib3
+  ref: 8434c77d845255c4002b505c6c2d79c3b35def0d
+  unpetrify-ref: 1.10.4
+  build-system: python-distutils
+- name: oslo-concurrency
+  repo: upstream:openstack/oslo-concurrency
+  ref: a2473ed0a59e4553766ffcb1ee8f06cb98b14a48
+  unpetrify-ref: 1.8.0
+  build-system: python-distutils
+  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-system: python-distutils
   build-depends:
+  - oslo-concurrency
   - suds
-  - eventlet
+  - urllib3
+  - httplib2
 - name: taskflow
   repo: upstream:openstack/taskflow
-  ref: 1caaecc5d6b2aa4cde4a50e31d1d993fce7a66c4
-  unpetrify-ref: 0.5.0
-  build-depends:
-  - networkx
+  ref: 28bece7c7c97199b8d941b16865c3670c323589a
+  unpetrify-ref: 0.7.1
+  build-system: python-distutils
 - name: sqlalchemy-migrate
   repo: upstream:python-packages/sqlalchemy-migrate
-  ref: 089663761cc15f8b3cdb874b6a76270ccdd0a412
-  unpetrify-ref: 0.9.1
+  ref: e57ee4c3a4247c634980cbeba74d04a01253967d
+  unpetrify-ref: 0.9.6
+  build-system: python-distutils
   build-depends:
   - sqlalchemy
-  - python-decorator
   - tempita
 - name: oauthlib
   repo: upstream:python-packages/oauthlib
-  ref: de773eefcb3c1afe54a0c12d5bf9bd214ceaf404
-  unpetrify-ref: 0.6.3
+  ref: fd239fca84644896b1971cf24bc6213d065adb86
+  unpetrify-ref: 0.7.2
+  build-system: python-distutils
   build-depends:
   - docutils
   - creole
   - pycco
-  - mock
-  - nose
   - sphinx
   - pyjwt
 - name: happybase
   repo: upstream:python-packages/happybase
   ref: 90a4b7ef741f0ecfe5145693f64c6f7180b9ba3d
   unpetrify-ref: 0.8
+  build-system: python-distutils
   build-depends:
   - thrift
 - name: osprofiler
   repo: upstream:python-packages/osprofiler
   ref: bbe39b517263017c9db56ae1d904d08846eacff7
   unpetrify-ref: 0.3.0
-  build-depends:
-  - webob
-- name: oslotest
-  repo: upstream:openstack/oslotest
-  ref: cfdb562a6e07728570ca624a8c4faf3f5b61423b
-  unpetrify-ref: 1.2.0
-  build-depends:
-  - fixtures
-  - subunit
-  - testrepository
-  - testscenarios
-  - testtools
-  - mock
-  - mox
+  build-system: python-distutils
 - name: pycadf
   repo: upstream:python-packages/pycadf
-  ref: 52727bcea3a98e72331e748ce5f9e3a111a64cd1
-  unpetrify-ref: 0.6.0
+  ref: 9501f4f74c5d800ae43edbe52680e285cf98c710
+  unpetrify-ref: 0.9.0
+  build-system: python-distutils
   build-depends:
+  - oslo-context
   - oslo-messaging
   - posix-ipc-tarball
-  - webob
-- name: python-xattr
-  morph: strata/openstack-services/python-xattr.morph
-  repo: upstream:python-packages/xattr
-  ref: dd10d44e3eb9a1d2303c1f7d5126c099d56e97fc
-  unpetrify-ref: v0.7.6
 - name: keystonemiddleware
   repo: upstream:openstack/keystonemiddleware
-  ref: a7beb50b38be5c3dd4c44d68ad79d1bb206dab6b
-  unpetrify-ref: 1.2.0
+  ref: 0e63b0e13d0a7919fddd7576c99bc15a45d31a9f
+  unpetrify-ref: 1.5.1
+  build-system: python-distutils
   build-depends:
-  - webob
+  - 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-system: python-distutils
   build-depends:
   - alembic
   - sqlalchemy
   - sqlalchemy-migrate
 - name: glance_store
   repo: upstream:openstack/glance_store.git
-  ref: 54f673d4133c1244e2555e7ceb3344c104a74154
-  unpetrify-ref: 0.1.8
-  build-depends:
-  - eventlet
+  ref: ea88e503b617a7ac9a0ae7e537d6517e9992a104
+  unpetrify-ref: 0.4.0
+  build-system: python-distutils
+  build-depends:
+  - ordereddict
+  - oslo-concurrency
+- name: oslo-log
+  repo: upstream:openstack/oslo-log
+  ref: 54e3d0e705accfaa4c73a01fc2ea1480fcc0024e
+  unpetrify-ref: 1.0.0
+  build-system: python-distutils
+  build-depends:
+  - oslo-context
+- name: oslo-policy
+  repo: upstream:openstack/oslo-policy
+  ref: 4c8f38cd1d088c46be314b47f6774e721813c6d9
+  unpetrify-ref: 0.3.2
+  build-system: python-distutils
+- name: semantic-version
+  repo: upstream:python-packages/semantic-version
+  ref: 2174bdcae6e46f5f68f5b8ea984a695db9f41bcf
+  unpetrify-ref: v2.4.1
+  build-system: python-distutils
 - name: glance
+  morph: strata/openstack-services/glance.morph
   repo: upstream:openstack/glance
-  ref: 055adff1d95dca72074da898b541cb4a6b62406d
-  unpetrify-ref: 2014.2.1
+  ref: 93b0d5fce3a41e4a3a549f98f78b6681cbc3ea95
+  unpetrify-ref: 2015.1.0
   build-depends:
-  - greenlet
   - sqlalchemy
   - anyjson
-  - eventlet
-  - pastedeploy
   - routes
-  - webob
-  - boto
   - sqlalchemy-migrate
   - httplib2
   - kombu
   - 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
+  build-system: python-distutils
+- name: pysaml2
+  repo: upstream:python-packages/pysaml2.git
+  ref: 13ff5e8899300c9b359fa1bdfdb3d412be0d7356
+  unpetrify-ref: 2.4.0
+  build-system: python-distutils
 - name: keystone
+  morph: strata/openstack-services/keystone.morph
   repo: upstream:openstack/keystone
-  ref: 615f79bb97883eee76923527cea13c2f72baa7ff
-  unpetrify-ref: 2014.2.1
+  ref: 5d3b31f9c3d34599ff8a83eeb7530fc6e0b1b67b
+  unpetrify-ref: 2015.1.0
   build-depends:
-  - webob
-  - eventlet
-  - greenlet
-  - pastedeploy
   - paste
   - routes
   - sqlalchemy
   - 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: dfa4b4b9b6b19a627cfb5eb5c6ab9db4961a06ea
-  unpetrify-ref: 2014.2.1
+  ref: 7260e0e3fc2ea479e80e0962624aca7fd38a1f60
+  unpetrify-ref: 2015.1.0
   build-depends:
   - paste
-  - pastedeploy
   - routes
-  - anyjson
-  - eventlet
-  - greenlet
   - httplib2
   - jsonrpclib
   - keystonemiddleware
   - sqlalchemy
-  - webob
   - alembic
+  - retrying
   - oslo-db
   - oslo-messaging
   - oslo-rootwrap
-- name: swift
-  repo: upstream:openstack/swift
-  ref: 2e8261a4dc0d0af0c4a46478b81e167bcf02220b
-  unpetrify-ref: 2.2.0
-  build-depends:
-  - dnspython
-  - eventlet
-  - greenlet
-  - netifaces
-  - pastedeploy
-  - python-xattr
+  - oslo-concurrency
+  - oslo-context
+  - oslo-log
+  - oslo-middleware
 - name: wsgiref
   repo: upstream:python-packages/wsgiref.git
   ref: e8360785eef259394e13b2062407edc3c2cbc1e0
   unpetrify-ref: baserock/master
+  build-system: python-distutils
 - name: rfc3986
   repo: upstream:python-packages/python-rfc3986.git
   ref: 9817ec3e47bca8fba9a7cac56d785e9d644f7473
   unpetrify-ref: rfc3986-0.2.0
+  build-system: python-distutils
 - name: urwid
   repo: upstream:python-packages/urwid
   ref: 838839f7a300a774240d52f943aafd6ff44b2413
   unpetrify-ref: release-1.3.0
+  build-system: python-distutils
 - name: configshell-fb
   repo: upstream:python-packages/configshell-fb
   ref: 8c151ccdd75956da60b2304417c41a60a2c28231
   unpetrify-ref: v1.1.fb17
+  build-system: python-distutils
 - name: targetcli-fb
   repo: upstream:python-packages/targetcli
   ref: c62610f3c2da6b4d364028c18bcc7f0d3da54477
   unpetrify-ref: v2.1.fb39
+  build-system: python-distutils
   build-depends:
   - configshell-fb
   - rtslib-fb
@@ -621,6 +584,7 @@ chunks:
   repo: upstream:sysfsutils
   ref: 237bf36e664db92f95b75067bf0f246726993254
   unpetrify-ref: sysfsutils-2_1_0
+  build-system: autotools
 - name: open-iscsi
   morph: strata/openstack-services/open-iscsi.morph
   repo: upstream:open-iscsi
@@ -629,165 +593,160 @@ chunks:
 - name: nova
   morph: strata/openstack-services/nova.morph
   repo: upstream:openstack/nova
-  ref: ba25e9ea6d0d42dd3b78cc6440710fd9362ae1b5
-  unpetrify-ref: 2014.2.1
+  ref: 8397b6464af520903f546ce4c6d51a2eb5b4c8a8
+  unpetrify-ref: 2015.1.0
   build-depends:
   - sqlalchemy
-  - anyjson
-  - boto
-  - python-decorator
-  - eventlet
   - keystonemiddleware
-  - kombu
   - routes
-  - webob
-  - greenlet
-  - pastedeploy
   - 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: b48aee211ad9b2571c8554dd162b37b8a8d80a42
-  unpetrify-ref: 2014.2.1
+  ref: 5987bb2290f629e59b0bcced2f8fe22cdeb9cc6d
+  unpetrify-ref: 2015.1.0
   build-depends:
   - anyjson
-  - eventlet
-  - greenlet
   - keystonemiddleware
   - kombu
+  - oslo-concurrency
+  - oslo-context
   - oslo-db
+  - oslo-log
   - oslo-messaging
+  - oslo-middleware
   - oslo-rootwrap
   - osprofiler
   - paste
-  - pastedeploy
+  - retrying
   - routes
   - taskflow
   - rtslib-fb
   - sqlalchemy
   - sqlalchemy-migrate
   - suds
-  - webob
-  - wsgiref
-- name: kazoo
-  repo: upstream:python-packages/kazoo.git
-  ref: 93a718ea4c20df797766742c3d74de281613c651
-  unpretrify-ref: 2.0
+  - oslo-vmware
 - name: pymemcache
-  repo: upstream:python-packages/pymemcache.git
-  ref: 3824d3b0bcdea3e8d0c08598bedfce10fd3c79e0
-  unpetrify-ref: master
-  build-depends:
-  - nose
-- name: zake
-  repo: upstream:python-packages/zake.git
-  ref: 13b92d9db4ad37d9550ef5c5abd323a2530a1e72
-  unpetrify-ref: master
-  build-depends:
-  - kazoo
-  - testtools
+  repo: upstream:python-packages/pymemcache
+  ref: 0646937c2bfebdb557ec2c01f0e42a9af79ad49d
+  unpetrify-ref: v1.2.9
+  build-system: python-distutils
 - name: sysv_ipc-tarball
   repo: upstream:python-packages/sysv-ipc-tarball.git
   ref: a77e3a63f004e6ee789fa05e4a5bbc333b1529f1
   unpetrify-ref: sysv_ipc-0.6.8
+  build-system: python-distutils
+- name: redis-py
+  repo: upstream:python-packages/redis-py
+  ref: 4d0b0afe9c9a431ed50c3e9fb95a0aa88b1f1038
+  unpetrify-ref: 2.10.3
+  build-system: python-distutils
 - 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-system: python-distutils
   build-depends:
-  - kazoo
   - pymemcache
-  - zake
-  - sysv_ipc-tarball
   - msgpack-python
   - retrying
+  - redis-py
+- name: kafka-python
+  repo: upstream:python-packages/kafka-python
+  ref: 8675c3e3e620df5ba9fd7e570c554b773429bd78
+  unpetrify-ref: v0.9.3
+  build-system: python-distutils
+- name: werkzeug
+  repo: upstream:python-packages/werkzeug
+  ref: 96e49709d627a7766077cff4c98ebf3cad868ceb
+  unpetrify-ref: v0.10.4
+  build-system: python-distutils
+- name: requests-aws
+  repo: upstream:python-packages/python-requests-aws
+  ref: 48fe401c78eb1b1048cd20e2d26015585a7986cb
+  unpetrify-ref: master
+  build-system: python-distutils
 - name: ceilometer
   repo: upstream:openstack/ceilometer
   morph: strata/openstack-services/ceilometer.morph
-  ref: 1129b7013359bf242a2ea53be9d4faeccfbfac5a
-  unpetrify-ref: 2014.2.1
+  ref: b0447ed8e7bee371bf7095c86e47d717abe89edc
+  unpetrify-ref: 2014.1.0
   build-depends:
+  - retrying
   - alembic
-  - anyjson
   - croniter
-  - eventlet
-  - happybase
   - jsonpath-rw
+  - kafka-python
   - keystonemiddleware
-  - lockfile
   - msgpack-python
+  - oslo-context
   - oslo-db
+  - oslo-concurrency
+  - oslo-policy
   - oslo-rootwrap
-  - oslo-vmware
-  - pastedeploy
   - pecan
   - posix-ipc-tarball
   - oslo-messaging
+  - oslo-middleware
   - pysnmp
   - sqlalchemy
   - sqlalchemy-migrate
   - tooz
-  - webob
+  - werkzeug
   - wsme
+  - requests-aws
 - name: django-openstack-auth
   repo: upstream:openstack/django_openstack_auth
-  ref: e676c88a329af57d6c4f13df54f6e1e06c1f8360
-  unpetrify-ref: 1.1.8
+  ref: 0e1f7b78277850634992a594132921efb83256e0
+  unpetrify-ref: 1.2.0
+  build-system: python-distutils
+- name: pint
+  repo: upstream:python-packages/pint
+  ref: e7e7de5ca2e1c19963be8a918369fb19186f9a73
+  unpetrify-ref: 0.6
+  build-system: python-distutils
 - name: horizon
   morph: strata/openstack-services/horizon.morph
   repo: upstream:openstack/horizon
-  ref: 3d9a31e2a05288e9a48a51eb4fe693c42e92aac7
-  unpetrify-ref: 2014.2.1
+  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: fc00821eba469641c6c94706726c3d78e46460a2
-  unpetrify-ref: v0.5.1
-- name: oauth
-  repo: upstream:python-packages/oauthlib
-  ref: fd239fca84644896b1971cf24bc6213d065adb86
-  unpetrify-ref: 0.072
+  ref: 97be997f62d59c028fc45323b00e3b93fafe4eb4
+  unpetrify-ref: baserock/v0.5.1
 - name: pyserial
   repo: upstream:python-packages/pyserial
   ref: bcfc1ec2fdb9a8c9c867481d7673e85fe512e667
   unpetrify-ref: release2_7
-- name: testresources
-  repo: upstream:python-packages/testresources
-  ref: ef938bcce0e436f9e9ffef932a898dc248a1d6ea
-  unpetrify-ref: 0.2.7
-  build-depends:
-  - testtools
-  - fixtures
-  - check
-  - cppunit
-- name: mox3
-  repo: upstream:python-packages/pymox
-  ref: 444fa40f4edb529efbffa2da8dbd97e9b8564b5c
-  unpetrify-ref: master
-- name: mocker
-  repo: upstream:python-packages/mocker
-  ref: f7f87e4ac1c52342162cf2035f5fe3d273f8b07f
-  unpetrify-ref: master
+  build-system: python-distutils
+- name: tempest-lib
+  repo: upstream:openstack/tempest-lib
+  ref: c307ffc525d896e2071319c8067aec805804f92b
+  unpetrify-ref: 0.5.0
+  build-system: python-distutils
 - 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
@@ -798,7 +757,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
@@ -806,5 +765,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