From c734b47f8e9852c17e7cbed2cf7ad718e01e6be3 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Wed, 13 May 2015 10:42:03 +0000
Subject: Upgrade oslo-utils to 1.4.0

Also move netifaces to openstack-common, because it's needed
for the new version of oslo-utils
---
 strata/openstack-common.morph | 10 ++++++++--
 strata/swift.morph            |  7 +------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph
index 34d979a9..ce66f0f6 100644
--- a/strata/openstack-common.morph
+++ b/strata/openstack-common.morph
@@ -72,14 +72,20 @@ chunks:
   unpetrify-ref: 0.4.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
diff --git a/strata/swift.morph b/strata/swift.morph
index 22ca8a3a..5295b6a5 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
-- 
cgit v1.2.1