diff options
Diffstat (limited to 'meta-openstack/recipes-devtools')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-cinder/cinder-builtin-tests-config-location.patch | 4 | ||||
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-cinder_git.bb | 6 |
2 files changed, 5 insertions, 5 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( |
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb index 0866dca..c648bae 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" | |||
7 | PR = "r0" | 7 | PR = "r0" |
8 | SRCNAME = "cinder" | 8 | SRCNAME = "cinder" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/icehouse \ | 10 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ |
11 | file://cinder.conf \ | 11 | file://cinder.conf \ |
12 | file://cinder.init \ | 12 | file://cinder.init \ |
13 | file://cinder-volume \ | 13 | file://cinder-volume \ |
@@ -20,8 +20,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/icehouse \ | |||
20 | file://cinder-builtin-tests-config-location.patch \ | 20 | file://cinder-builtin-tests-config-location.patch \ |
21 | " | 21 | " |
22 | 22 | ||
23 | SRCREV="978b036a6467f7f6afb4419f92bf4fa7d1ff2347" | 23 | SRCREV="116f54dbf188a17b5e3dd966658e98bf19b8912b" |
24 | PV="2014.1+git${SRCPV}" | 24 | PV="2014.2.b1+git${SRCPV}" |
25 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
26 | 26 | ||
27 | inherit setuptools update-rc.d identity default_configs | 27 | inherit setuptools update-rc.d identity default_configs |