From 8960736a00c5b413e952c316bc5d578575f1f202 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Thu, 14 May 2015 14:11:12 +0000
Subject: Upgrade nova to 2005.1.0 (Kilo)

The following upgrades were needed:
- 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
---
 strata/openstack-clients.morph  | 18 +++++++++---------
 strata/openstack-services.morph | 20 ++++++++------------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph
index c5b9308a..8c5840ac 100644
--- a/strata/openstack-clients.morph
+++ b/strata/openstack-clients.morph
@@ -14,8 +14,8 @@ chunks:
   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
@@ -45,22 +45,22 @@ 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
diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index e04d94d5..c61bc110 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -23,8 +23,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
@@ -500,27 +500,23 @@ 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
-- 
cgit v1.2.1