diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-07-18 16:08:34 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-07-18 16:08:34 -0400 |
| commit | 0b05b9a4c7085c1752fb317b3e2ffc90d76220d3 (patch) | |
| tree | dc39c567b2a9cba8e955b1e39672599971ede73c /meta-openstack/recipes-devtools/python/python-cinder | |
| parent | 231bcf46fd9d999e8ea4ef354d1ee400bef727d5 (diff) | |
| download | meta-cloud-services-0b05b9a4c7085c1752fb317b3e2ffc90d76220d3.tar.gz | |
cinder: uprev to juno
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-cinder')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-cinder/cinder-builtin-tests-config-location.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-cinder/cinder-builtin-tests-config-location.patch b/meta-openstack/recipes-devtools/python/python-cinder/cinder-builtin-tests-config-location.patch index 53da893..1981a87 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder/cinder-builtin-tests-config-location.patch +++ b/meta-openstack/recipes-devtools/python/python-cinder/cinder-builtin-tests-config-location.patch | |||
| @@ -13,10 +13,10 @@ Index: git/cinder/tests/conf_fixture.py | |||
| 13 | =================================================================== | 13 | =================================================================== |
| 14 | --- git.orig/cinder/tests/conf_fixture.py | 14 | --- git.orig/cinder/tests/conf_fixture.py |
| 15 | +++ git/cinder/tests/conf_fixture.py | 15 | +++ git/cinder/tests/conf_fixture.py |
| 16 | @@ -43,7 +43,7 @@ def set_defaults(conf): | 16 | @@ -43,7 +43,7 @@ |
| 17 | conf.set_default('iscsi_num_targets', 8) | 17 | conf.set_default('iscsi_num_targets', 8) |
| 18 | conf.set_default('connection', 'sqlite://', group='database') | 18 | conf.set_default('connection', 'sqlite://', group='database') |
| 19 | conf.set_default('sqlite_synchronous', False) | 19 | conf.set_default('sqlite_synchronous', False, group='database') |
| 20 | - conf.set_default('policy_file', 'cinder/tests/policy.json') | 20 | - conf.set_default('policy_file', 'cinder/tests/policy.json') |
| 21 | + conf.set_default('policy_file', '%PYTHON_SITEPACKAGES_DIR%/cinder/tests/policy.json') | 21 | + conf.set_default('policy_file', '%PYTHON_SITEPACKAGES_DIR%/cinder/tests/policy.json') |
| 22 | conf.set_default( | 22 | conf.set_default( |