diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2018-06-11 10:24:31 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-06-11 12:06:40 -0400 |
commit | 4b37a01d3fc80310c6c46b3abc1cc3b4d4cf6457 (patch) | |
tree | c3ab815e90ae716c1d5b87b26fd2a66d7f8d6ec1 /meta-openstack/recipes-devtools/python/python-barbican/barbican-fix-path-to-find-configuration-files.patch | |
parent | 8067b919eb28c8e9b917b63b32dd90f6c5feef29 (diff) | |
download | meta-cloud-services-4b37a01d3fc80310c6c46b3abc1cc3b4d4cf6457.tar.gz |
housekeeping: patch refresh
Bitbake now prints warnings when a patch is successfully applied but
there is fuzz or an offset. The following refreshes patches for
several packages which report warnings when openstack-image-controller
is built.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-barbican/barbican-fix-path-to-find-configuration-files.patch')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-barbican/barbican-fix-path-to-find-configuration-files.patch | 12 |
1 files changed, 5 insertions, 7 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 @@ | |||
1 | From 30a57a0b4f2dcaff76821f21f4a545ecb9ddf194 Mon Sep 17 00:00:00 2001 | 1 | From 3364915002aa2deaf63841e338375648e5dc8f24 Mon Sep 17 00:00:00 2001 |
2 | From: Keith Holman <Keith.Holman@windriver.com> | 2 | From: Keith Holman <Keith.Holman@windriver.com> |
3 | Date: Fri, 13 Jun 2014 13:46:04 -0400 | 3 | Date: Fri, 13 Jun 2014 13:46:04 -0400 |
4 | Subject: [PATCH] barbican: fix path to find configuration files | 4 | Subject: [PATCH] barbican: fix path to find configuration files |
@@ -10,15 +10,16 @@ recipe. This fix updates the location for the configuration files | |||
10 | with an identifier that is replaced during deployment. | 10 | with an identifier that is replaced during deployment. |
11 | 11 | ||
12 | Signed-off-by: Keith Holman <Keith.Holman@windriver.com> | 12 | Signed-off-by: Keith Holman <Keith.Holman@windriver.com> |
13 | |||
13 | --- | 14 | --- |
14 | barbican/tests/api/test_resources_policy.py | 3 +-- | 15 | barbican/tests/api/test_resources_policy.py | 3 +-- |
15 | 1 file changed, 1 insertion(+), 2 deletions(-) | 16 | 1 file changed, 1 insertion(+), 2 deletions(-) |
16 | 17 | ||
17 | diff --git a/barbican/tests/api/test_resources_policy.py b/barbican/tests/api/test_resources_policy.py | 18 | diff --git a/barbican/tests/api/test_resources_policy.py b/barbican/tests/api/test_resources_policy.py |
18 | index 7d995c6..28b7599 100644 | 19 | index 5c75bc3..f2332f6 100644 |
19 | --- a/barbican/tests/api/test_resources_policy.py | 20 | --- a/barbican/tests/api/test_resources_policy.py |
20 | +++ b/barbican/tests/api/test_resources_policy.py | 21 | +++ b/barbican/tests/api/test_resources_policy.py |
21 | @@ -35,8 +35,7 @@ from barbican.openstack.common import policy | 22 | @@ -37,8 +37,7 @@ from barbican.tests import utils |
22 | CONF = cfg.CONF | 23 | CONF = cfg.CONF |
23 | 24 | ||
24 | # Point to the policy.json file located in source control. | 25 | # Point to the policy.json file located in source control. |
@@ -26,8 +27,5 @@ index 7d995c6..28b7599 100644 | |||
26 | - '../../../etc', 'barbican')) | 27 | - '../../../etc', 'barbican')) |
27 | +TEST_VAR_DIR = "%BARBICAN_CONF_DIR%" | 28 | +TEST_VAR_DIR = "%BARBICAN_CONF_DIR%" |
28 | 29 | ||
29 | ENFORCER = policy.Enforcer() | 30 | ENFORCER = policy.Enforcer(CONF) |
30 | 31 | ||
31 | -- | ||
32 | 1.9.3 | ||
33 | |||