From 13b41f6f83a4c28f450a4af9c64c72afb8bda58f Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Thu, 14 May 2015 17:29:54 +0000
Subject: Upgrade cinder to 2015.1.0 (Kilo), and dependencies

The following upgrade was needed:
- python-barbicanclient to 3.0.3
---
 strata/openstack-clients.morph  |  6 +++---
 strata/openstack-services.morph | 11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph
index 17ec35d5..b24f3d78 100644
--- a/strata/openstack-clients.morph
+++ b/strata/openstack-clients.morph
@@ -84,9 +84,9 @@ 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
diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index 1f02d2f9..96bad48f 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -532,24 +532,29 @@ chunks:
 - 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
-- 
cgit v1.2.1