From e3fe1465a141d114b2c19243d28bd1285e6054ef Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Tue, 12 Apr 2016 14:11:46 +0000
Subject: [PATCH] Charmhelper sync before 1604 testing

Change-Id: I21571f65020335f9bd469db6f082d3482e237534
---
 charmhelpers/contrib/openstack/utils.py | 2 +-
 requirements.txt                        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/charmhelpers/contrib/openstack/utils.py b/charmhelpers/contrib/openstack/utils.py
index 0dba98ff..61d58793 100644
--- a/charmhelpers/contrib/openstack/utils.py
+++ b/charmhelpers/contrib/openstack/utils.py
@@ -137,7 +137,7 @@ SWIFT_CODENAMES = OrderedDict([
     ('liberty',
         ['2.3.0', '2.4.0', '2.5.0']),
     ('mitaka',
-        ['2.5.0', '2.6.0']),
+        ['2.5.0', '2.6.0', '2.7.0']),
 ])
 
 # >= Liberty version->codename mapping
diff --git a/requirements.txt b/requirements.txt
index db0dfb3b..0c902746 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,7 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
+pbr>=1.8.0,<1.9.0
 PyYAML>=3.1.0
 simplejson>=2.2.0
 netifaces>=0.10.4