From a0b386076f8b1a83746b8a04f4016d4b423598cb Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Thu, 14 May 2015 16:10:43 +0000
Subject: Upgrade neutron to 2015.1.0 (Kilo), and dependencies

The following upgrade was needed:
- python-novaclient to 2.23.0
---
 strata/openstack-clients.morph  |  4 ++--
 strata/openstack-services.morph | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph
index 8c5840ac..17ec35d5 100644
--- a/strata/openstack-clients.morph
+++ b/strata/openstack-clients.morph
@@ -21,8 +21,8 @@ chunks:
   - 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
diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index 64cf417b..1649d009 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -451,20 +451,24 @@ chunks:
 - 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
-- 
cgit v1.2.1