diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-glance_git.bb')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-glance_git.bb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb index 54aaca2..14ce2bd 100644 --- a/meta-openstack/recipes-devtools/python/python-glance_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb | |||
| @@ -10,6 +10,7 @@ SRCNAME = "glance" | |||
| 10 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/icehouse \ | 10 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/icehouse \ |
| 11 | file://0001-glance-store-only-load-known-stores-not-all-stores.patch \ | 11 | file://0001-glance-store-only-load-known-stores-not-all-stores.patch \ |
| 12 | file://glance.init \ | 12 | file://glance.init \ |
| 13 | file://glance-change-builtin-tests-config-location.patch \ | ||
| 13 | " | 14 | " |
| 14 | 15 | ||
| 15 | SRCREV="556eebb7780b55af87c0fe49b76593f833ea189a" | 16 | SRCREV="556eebb7780b55af87c0fe49b76593f833ea189a" |
| @@ -27,6 +28,12 @@ GLANCE_KNOWN_STORES ?= "glance.store.rbd.Store,\ | |||
| 27 | glance.store.http.Store" | 28 | glance.store.http.Store" |
| 28 | 29 | ||
| 29 | 30 | ||
| 31 | do_install_prepend() { | ||
| 32 | sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/functional/__init__.py | ||
| 33 | sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/unit/base.py | ||
| 34 | sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/utils.py | ||
| 35 | } | ||
| 36 | |||
| 30 | do_install_append() { | 37 | do_install_append() { |
| 31 | TEMPLATE_CONF_DIR=${S}${sysconfdir} | 38 | TEMPLATE_CONF_DIR=${S}${sysconfdir} |
| 32 | GLANCE_CONF_DIR=${D}${sysconfdir}/glance | 39 | GLANCE_CONF_DIR=${D}${sysconfdir}/glance |
| @@ -153,6 +160,7 @@ RDEPENDS_${SRCNAME} = "${PN} \ | |||
| 153 | RDEPENDS_${SRCNAME}-api = "${SRCNAME}" | 160 | RDEPENDS_${SRCNAME}-api = "${SRCNAME}" |
| 154 | RDEPENDS_${SRCNAME}-registry = "${SRCNAME}" | 161 | RDEPENDS_${SRCNAME}-registry = "${SRCNAME}" |
| 155 | RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}" | 162 | RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}" |
| 163 | RDEPENDS_${SRCNAME}-tests = "python-psutil qpid-python" | ||
| 156 | 164 | ||
| 157 | INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-registry" | 165 | INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-registry" |
| 158 | INITSCRIPT_NAME_${SRCNAME}-api = "glance-api" | 166 | INITSCRIPT_NAME_${SRCNAME}-api = "glance-api" |
