2 files changed, 17 insertions, 18 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-barbican/barbican-fix-path-to-find-configuration-files.patch b/meta-openstack/recipes-devtools/python/python-barbican/barbican-fix-path-to-find-configuration-files.patch
index 8fd1010..b7e74cd 100644
--- a/meta-openstack/recipes-devtools/python/python-barbican/barbican-fix-path-to-find-configuration-files.patch
+++ b/meta-openstack/recipes-devtools/python/python-barbican/barbican-fix-path-to-find-configuration-files.patch
@@ -1,4 +1,4 @@
-From 30a57a0b4f2dcaff76821f21f4a545ecb9ddf194 Mon Sep 17 00:00:00 2001
+From 3364915002aa2deaf63841e338375648e5dc8f24 Mon Sep 17 00:00:00 2001
 From: Keith Holman <Keith.Holman@windriver.com>
 Date: Fri, 13 Jun 2014 13:46:04 -0400
 Subject: [PATCH] barbican: fix path to find configuration files
@@ -10,15 +10,16 @@ recipe.  This fix updates the location for the configuration files
 with an identifier that is replaced during deployment.
 
 Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
+
 ---
  barbican/tests/api/test_resources_policy.py | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/barbican/tests/api/test_resources_policy.py b/barbican/tests/api/test_resources_policy.py
-index 7d995c6..28b7599 100644
+index 5c75bc3..f2332f6 100644
 --- a/barbican/tests/api/test_resources_policy.py
 +++ b/barbican/tests/api/test_resources_policy.py
-@@ -35,8 +35,7 @@ from barbican.openstack.common import policy
+@@ -37,8 +37,7 @@ from barbican.tests import utils
  CONF = cfg.CONF
  
  # Point to the policy.json file located in source control.
@@ -26,8 +27,5 @@ index 7d995c6..28b7599 100644
 -                                            '../../../etc', 'barbican'))
 +TEST_VAR_DIR = "%BARBICAN_CONF_DIR%"
  
- ENFORCER = policy.Enforcer()
+ ENFORCER = policy.Enforcer(CONF)
  
--- 
-1.9.3
-
diff --git a/meta-openstack/recipes-devtools/python/python-barbican/barbican-increase-buffer-size-to-support-PKI-tokens.patch b/meta-openstack/recipes-devtools/python/python-barbican/barbican-increase-buffer-size-to-support-PKI-tokens.patch
index acde89c..c85e473 100644
--- a/meta-openstack/recipes-devtools/python/python-barbican/barbican-increase-buffer-size-to-support-PKI-tokens.patch
+++ b/meta-openstack/recipes-devtools/python/python-barbican/barbican-increase-buffer-size-to-support-PKI-tokens.patch
@@ -1,4 +1,4 @@
-From 8b78d792ca7f7ba4e105225c3917c0a467a2fadb Mon Sep 17 00:00:00 2001
+From 542a384cf1de68dc21ec335ff9518889e342d76e Mon Sep 17 00:00:00 2001
 From: Keith Holman <Keith.Holman@windriver.com>
 Date: Thu, 22 May 2014 12:08:13 -0400
 Subject: [PATCH] barbican: increase buffer-size to support PKI tokens
@@ -10,25 +10,26 @@ buffer size uWSGI uses fixes this problem.  This fix allows the
 packet sized to be specified in the build recipe file.
 
 Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
+
 ---
  etc/barbican/vassals/barbican-admin.ini | 1 +
  etc/barbican/vassals/barbican-api.ini   | 1 +
  2 files changed, 2 insertions(+)
 
-Index: git/etc/barbican/vassals/barbican-admin.ini
-===================================================================
---- git.orig/etc/barbican/vassals/barbican-admin.ini
-+++ git/etc/barbican/vassals/barbican-admin.ini
-@@ -9,3 +9,4 @@
+diff --git a/etc/barbican/vassals/barbican-admin.ini b/etc/barbican/vassals/barbican-admin.ini
+index cd8bc49..562b6e7 100644
+--- a/etc/barbican/vassals/barbican-admin.ini
++++ b/etc/barbican/vassals/barbican-admin.ini
+@@ -9,3 +9,4 @@ memory-report = true
  plugins = python
  paste = config:/etc/barbican/barbican-admin-paste.ini
  add-header = Connection: close
 +buffer-size = %BARBICAN_MAX_PACKET_SIZE%
-Index: git/etc/barbican/vassals/barbican-api.ini
-===================================================================
---- git.orig/etc/barbican/vassals/barbican-api.ini
-+++ git/etc/barbican/vassals/barbican-api.ini
-@@ -9,3 +9,4 @@
+diff --git a/etc/barbican/vassals/barbican-api.ini b/etc/barbican/vassals/barbican-api.ini
+index a4f0bee..fa476b6 100644
+--- a/etc/barbican/vassals/barbican-api.ini
++++ b/etc/barbican/vassals/barbican-api.ini
+@@ -9,3 +9,4 @@ memory-report = true
  plugins = python
  paste = config:/etc/barbican/barbican-api-paste.ini
  add-header = Connection: close