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 | 36 |
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" | |||
25 | GROUP = "glance" | 25 | GROUP = "glance" |
26 | 26 | ||
27 | USERADD_PACKAGES = "${PN}" | 27 | USERADD_PACKAGES = "${PN}" |
28 | GROUPADD_PARAM_${PN} = "--system ${GROUP}" | 28 | GROUPADD_PARAM:${PN} = "--system ${GROUP}" |
29 | USERADD_PARAM_${PN} = "--system -m -d ${localstatedir}/lib/glance -s /bin/false -g ${GROUP} ${USER}" | 29 | USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/glance -s /bin/false -g ${GROUP} ${USER}" |
30 | 30 | ||
31 | GLANCE_DEFAULT_STORE ?= "file" | 31 | GLANCE_DEFAULT_STORE ?= "file" |
32 | GLANCE_KNOWN_STORES ?= "glance.store.rbd.Store,\ | 32 | GLANCE_KNOWN_STORES ?= "glance.store.rbd.Store,\ |
@@ -56,13 +56,13 @@ python () { | |||
56 | } | 56 | } |
57 | SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST" | 57 | SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST" |
58 | 58 | ||
59 | do_install_prepend() { | 59 | do_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 | ||
65 | do_install_append() { | 65 | do_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 | ||
141 | PACKAGES += " ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-registry" | 141 | PACKAGES += " ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-registry" |
142 | 142 | ||
143 | FILES_${PN} = " \ | 143 | FILES:${PN} = " \ |
144 | ${libdir}/* \ | 144 | ${libdir}/* \ |
145 | ${datadir}/etc/${SRCNAME}* \ | 145 | ${datadir}/etc/${SRCNAME}* \ |
146 | " | 146 | " |
147 | 147 | ||
148 | FILES_${SRCNAME} = "${bindir}/* \ | 148 | FILES:${SRCNAME} = "${bindir}/* \ |
149 | ${sysconfdir}/${SRCNAME}/* \ | 149 | ${sysconfdir}/${SRCNAME}/* \ |
150 | ${localstatedir}/* \ | 150 | ${localstatedir}/* \ |
151 | " | 151 | " |
152 | 152 | ||
153 | FILES_${SRCNAME}-setup = " \ | 153 | FILES:${SRCNAME}-setup = " \ |
154 | ${systemd_unitdir}/system/glance-init.service \ | 154 | ${systemd_unitdir}/system/glance-init.service \ |
155 | " | 155 | " |
156 | 156 | ||
157 | FILES_${SRCNAME}-api = " \ | 157 | FILES:${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 | ||
162 | FILES_${SRCNAME}-registry = "\ | 162 | FILES:${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 | ||
177 | RDEPENDS_${PN} += " \ | 177 | RDEPENDS:${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 | ||
221 | RDEPENDS_${SRCNAME} = " \ | 221 | RDEPENDS:${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 | ||
228 | RDEPENDS_${SRCNAME}-api = "${SRCNAME}" | 228 | RDEPENDS:${SRCNAME}-api = "${SRCNAME}" |
229 | RDEPENDS_${SRCNAME}-registry = "${SRCNAME}" | 229 | RDEPENDS:${SRCNAME}-registry = "${SRCNAME}" |
230 | RDEPENDS_${SRCNAME}-setup = "postgresql keystone-setup sudo ${SRCNAME}" | 230 | RDEPENDS:${SRCNAME}-setup = "postgresql keystone-setup sudo ${SRCNAME}" |
231 | RDEPENDS_${SRCNAME}-tests = "python-psutil qpid-python bash" | 231 | RDEPENDS:${SRCNAME}-tests = "python-psutil qpid-python bash" |
232 | 232 | ||
233 | SYSTEMD_PACKAGES = "${SRCNAME}-api ${SRCNAME}-registry ${SRCNAME}-setup" | 233 | SYSTEMD_PACKAGES = "${SRCNAME}-api ${SRCNAME}-registry ${SRCNAME}-setup" |
234 | SYSTEMD_SERVICE_${SRCNAME}-api = "glance-api.service" | 234 | SYSTEMD_SERVICE:${SRCNAME}-api = "glance-api.service" |
235 | SYSTEMD_SERVICE_${SRCNAME}-registry = "glance-registry.service" | 235 | SYSTEMD_SERVICE:${SRCNAME}-registry = "glance-registry.service" |
236 | SYSTEMD_SERVICE_${SRCNAME}-setup = "glance-init.service" | 236 | SYSTEMD_SERVICE:${SRCNAME}-setup = "glance-init.service" |
237 | 237 | ||
238 | MONITOR_SERVICE_PACKAGES = "${SRCNAME}" | 238 | MONITOR_SERVICE_PACKAGES = "${SRCNAME}" |
239 | MONITOR_SERVICE_${SRCNAME} = "glance" | 239 | MONITOR_SERVICE_${SRCNAME} = "glance" |