summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-glance_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-glance_git.bb')
-rw-r--r--meta-openstack/recipes-devtools/python/python-glance_git.bb36
1 files changed, 18 insertions, 18 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb
index f692963..a9537ce 100644
--- a/meta-openstack/recipes-devtools/python/python-glance_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb
@@ -25,8 +25,8 @@ USER = "glance"
25GROUP = "glance" 25GROUP = "glance"
26 26
27USERADD_PACKAGES = "${PN}" 27USERADD_PACKAGES = "${PN}"
28GROUPADD_PARAM_${PN} = "--system ${GROUP}" 28GROUPADD_PARAM:${PN} = "--system ${GROUP}"
29USERADD_PARAM_${PN} = "--system -m -d ${localstatedir}/lib/glance -s /bin/false -g ${GROUP} ${USER}" 29USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/glance -s /bin/false -g ${GROUP} ${USER}"
30 30
31GLANCE_DEFAULT_STORE ?= "file" 31GLANCE_DEFAULT_STORE ?= "file"
32GLANCE_KNOWN_STORES ?= "glance.store.rbd.Store,\ 32GLANCE_KNOWN_STORES ?= "glance.store.rbd.Store,\
@@ -56,13 +56,13 @@ python () {
56} 56}
57SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST" 57SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST"
58 58
59do_install_prepend() { 59do_install:prepend() {
60 sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/functional/__init__.py 60 sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/functional/__init__.py
61 sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/unit/base.py 61 sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/unit/base.py
62 sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/utils.py 62 sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/utils.py
63} 63}
64 64
65do_install_append() { 65do_install:append() {
66 SRC_SYSCONFDIR=${S}${sysconfdir} 66 SRC_SYSCONFDIR=${S}${sysconfdir}
67 GLANCE_CONF_DIR=${D}${sysconfdir}/glance 67 GLANCE_CONF_DIR=${D}${sysconfdir}/glance
68 68
@@ -140,26 +140,26 @@ do_install_append() {
140 140
141PACKAGES += " ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-registry" 141PACKAGES += " ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-registry"
142 142
143FILES_${PN} = " \ 143FILES:${PN} = " \
144 ${libdir}/* \ 144 ${libdir}/* \
145 ${datadir}/etc/${SRCNAME}* \ 145 ${datadir}/etc/${SRCNAME}* \
146 " 146 "
147 147
148FILES_${SRCNAME} = "${bindir}/* \ 148FILES:${SRCNAME} = "${bindir}/* \
149 ${sysconfdir}/${SRCNAME}/* \ 149 ${sysconfdir}/${SRCNAME}/* \
150 ${localstatedir}/* \ 150 ${localstatedir}/* \
151 " 151 "
152 152
153FILES_${SRCNAME}-setup = " \ 153FILES:${SRCNAME}-setup = " \
154 ${systemd_unitdir}/system/glance-init.service \ 154 ${systemd_unitdir}/system/glance-init.service \
155 " 155 "
156 156
157FILES_${SRCNAME}-api = " \ 157FILES:${SRCNAME}-api = " \
158 ${bindir}/glance-api \ 158 ${bindir}/glance-api \
159 ${systemd_unitdir}/system/glance-api.service \ 159 ${systemd_unitdir}/system/glance-api.service \
160 " 160 "
161 161
162FILES_${SRCNAME}-registry = "\ 162FILES:${SRCNAME}-registry = "\
163 ${bindir}/glance-registry \ 163 ${bindir}/glance-registry \
164 ${systemd_unitdir}/system/glance-registry.service \ 164 ${systemd_unitdir}/system/glance-registry.service \
165 " 165 "
@@ -174,7 +174,7 @@ DEPENDS += " \
174 python-pbr-native \ 174 python-pbr-native \
175 " 175 "
176 176
177RDEPENDS_${PN} += " \ 177RDEPENDS:${PN} += " \
178 coreutils \ 178 coreutils \
179 python-pbr \ 179 python-pbr \
180 python-sqlalchemy \ 180 python-sqlalchemy \
@@ -218,22 +218,22 @@ RDEPENDS_${PN} += " \
218 python-monotonic \ 218 python-monotonic \
219 " 219 "
220 220
221RDEPENDS_${SRCNAME} = " \ 221RDEPENDS:${SRCNAME} = " \
222 ${PN} \ 222 ${PN} \
223 postgresql \ 223 postgresql \
224 postgresql-client \ 224 postgresql-client \
225 python-psycopg2 \ 225 python-psycopg2 \
226 " 226 "
227 227
228RDEPENDS_${SRCNAME}-api = "${SRCNAME}" 228RDEPENDS:${SRCNAME}-api = "${SRCNAME}"
229RDEPENDS_${SRCNAME}-registry = "${SRCNAME}" 229RDEPENDS:${SRCNAME}-registry = "${SRCNAME}"
230RDEPENDS_${SRCNAME}-setup = "postgresql keystone-setup sudo ${SRCNAME}" 230RDEPENDS:${SRCNAME}-setup = "postgresql keystone-setup sudo ${SRCNAME}"
231RDEPENDS_${SRCNAME}-tests = "python-psutil qpid-python bash" 231RDEPENDS:${SRCNAME}-tests = "python-psutil qpid-python bash"
232 232
233SYSTEMD_PACKAGES = "${SRCNAME}-api ${SRCNAME}-registry ${SRCNAME}-setup" 233SYSTEMD_PACKAGES = "${SRCNAME}-api ${SRCNAME}-registry ${SRCNAME}-setup"
234SYSTEMD_SERVICE_${SRCNAME}-api = "glance-api.service" 234SYSTEMD_SERVICE:${SRCNAME}-api = "glance-api.service"
235SYSTEMD_SERVICE_${SRCNAME}-registry = "glance-registry.service" 235SYSTEMD_SERVICE:${SRCNAME}-registry = "glance-registry.service"
236SYSTEMD_SERVICE_${SRCNAME}-setup = "glance-init.service" 236SYSTEMD_SERVICE:${SRCNAME}-setup = "glance-init.service"
237 237
238MONITOR_SERVICE_PACKAGES = "${SRCNAME}" 238MONITOR_SERVICE_PACKAGES = "${SRCNAME}"
239MONITOR_SERVICE_${SRCNAME} = "glance" 239MONITOR_SERVICE_${SRCNAME} = "glance"