From e020a9b06a52fac6675d40298565a2a4103ccac6 Mon Sep 17 00:00:00 2001
From: Richard Ipsum <richard.ipsum@codethink.co.uk>
Date: Tue, 27 Jan 2015 11:01:15 +0000
Subject: Move pbr into python-core

Also move to pbr 0.10.7, this fixes an issue that stops the import tool
from importing packages that use pbr to install themselves.
---
 strata/openstack-clients.morph | 9 +--------
 strata/python-core.morph       | 6 ++++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph
index 616a8762..c4775219 100644
--- a/strata/openstack-clients.morph
+++ b/strata/openstack-clients.morph
@@ -2,6 +2,7 @@ name: openstack-clients
 kind: stratum
 description: A stratum with OpenStack clients, for OpenStack deployments.
 build-depends:
+- morph: strata/python-core.morph
 - morph: strata/tools.morph
 chunks:
 - name: jsonschema
@@ -33,11 +34,6 @@ chunks:
   ref: 941133673e5a0003cd5ce1b6db2a51cf3307d9c1
   unpetrify-ref: baserock/morph
   build-depends: []
-- name: pbr
-  repo: upstream:pbr
-  ref: 510ee9e9dcb94c5884c215fa3535a1f77f3d2a51
-  unpetrify-ref: baserock/morph
-  build-depends: []
 - name: argparse
   repo: upstream:argparse
   ref: c9b3f9b32949cb7dd798e7d1aedbeeef064aa4b1
@@ -85,7 +81,6 @@ chunks:
   ref: 21cc66a850c5ea1d2ffffb655da0c452b919ed3b
   unpetrify-ref: baserock/morph
   build-depends:
-  - pbr
   - pyiso8601
   - python-prettytable
   - python-requests
@@ -98,7 +93,6 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends:
   - python-prettytable
-  - pbr
   - argparse
   - pyopenssl
   - python-keystoneclient
@@ -109,7 +103,6 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends:
   - python-prettytable
-  - pbr
   - argparse
   - pyiso8601
   - python-requests
diff --git a/strata/python-core.morph b/strata/python-core.morph
index 7f00616e..a76262f4 100644
--- a/strata/python-core.morph
+++ b/strata/python-core.morph
@@ -9,3 +9,9 @@ chunks:
   ref: ea680f204fb0e48789710c22c8f597a9bf01bc16
   unpetrify-ref: baserock/master
   build-depends: []
+- name: pbr
+  repo: upstream:pbr
+  ref: aef4f7ef4faec987d553d1ca40b55951235af0b1
+  unpetrify-ref: 0.10.7
+  build-depends:
+  - pip
-- 
cgit v1.2.1