diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-cinder_git.bb')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-cinder_git.bb | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb index 8afe84d..e72d721 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb | |||
@@ -31,8 +31,8 @@ USER = "cinder" | |||
31 | GROUP = "cinder" | 31 | GROUP = "cinder" |
32 | 32 | ||
33 | USERADD_PACKAGES = "${PN}" | 33 | USERADD_PACKAGES = "${PN}" |
34 | GROUPADD_PARAM_${PN} = "--system ${GROUP}" | 34 | GROUPADD_PARAM:${PN} = "--system ${GROUP}" |
35 | USERADD_PARAM_${PN} = "--system -m -d ${localstatedir}/lib/cinder -s /bin/false -g ${GROUP} ${USER}" | 35 | USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/cinder -s /bin/false -g ${GROUP} ${USER}" |
36 | 36 | ||
37 | CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift" | 37 | CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift" |
38 | 38 | ||
@@ -44,7 +44,7 @@ CINDER_NFS_VOLUME_SERVERS ?= "${CINDER_NFS_VOLUME_SERVERS_DEFAULT}" | |||
44 | CINDER_GLUSTERFS_VOLUME_SERVERS_DEFAULT = "controller:/glusterfs_volumes" | 44 | CINDER_GLUSTERFS_VOLUME_SERVERS_DEFAULT = "controller:/glusterfs_volumes" |
45 | CINDER_GLUSTERFS_VOLUME_SERVERS ?= "${CINDER_GLUSTERFS_VOLUME_SERVERS_DEFAULT}" | 45 | CINDER_GLUSTERFS_VOLUME_SERVERS ?= "${CINDER_GLUSTERFS_VOLUME_SERVERS_DEFAULT}" |
46 | 46 | ||
47 | do_install_append() { | 47 | do_install:append() { |
48 | TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} | 48 | TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} |
49 | CINDER_CONF_DIR=${D}${sysconfdir}/${SRCNAME} | 49 | CINDER_CONF_DIR=${D}${sysconfdir}/${SRCNAME} |
50 | 50 | ||
@@ -160,35 +160,35 @@ do_install_append() { | |||
160 | #} | 160 | #} |
161 | 161 | ||
162 | PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler ${SRCNAME}-backup" | 162 | PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler ${SRCNAME}-backup" |
163 | ALLOW_EMPTY_${SRCNAME}-setup = "1" | 163 | ALLOW_EMPTY:${SRCNAME}-setup = "1" |
164 | ALLOW_EMPTY_${SRCNAME}-backup = "1" | 164 | ALLOW_EMPTY:${SRCNAME}-backup = "1" |
165 | ALLOW_EMPTY_${SRCNAME}-scheduler = "1" | 165 | ALLOW_EMPTY:${SRCNAME}-scheduler = "1" |
166 | ALLOW_EMPTY_${SRCNAME}-volume = "1" | 166 | ALLOW_EMPTY:${SRCNAME}-volume = "1" |
167 | ALLOW_EMPTY_${SRCNAME}-api = "1" | 167 | ALLOW_EMPTY:${SRCNAME}-api = "1" |
168 | 168 | ||
169 | RDEPENDS_${SRCNAME}-tests += " bash python" | 169 | RDEPENDS:${SRCNAME}-tests += " bash python" |
170 | 170 | ||
171 | FILES_${PN} = "${libdir}/* /etc/tgt" | 171 | FILES:${PN} = "${libdir}/* /etc/tgt" |
172 | 172 | ||
173 | FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/tools" | 173 | FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/tools" |
174 | 174 | ||
175 | FILES_${SRCNAME}-api = " \ | 175 | FILES:${SRCNAME}-api = " \ |
176 | ${bindir}/cinder-api \ | 176 | ${bindir}/cinder-api \ |
177 | " | 177 | " |
178 | 178 | ||
179 | FILES_${SRCNAME}-volume = " \ | 179 | FILES:${SRCNAME}-volume = " \ |
180 | ${bindir}/cinder-volume \ | 180 | ${bindir}/cinder-volume \ |
181 | " | 181 | " |
182 | 182 | ||
183 | FILES_${SRCNAME}-scheduler = " \ | 183 | FILES:${SRCNAME}-scheduler = " \ |
184 | ${bindir}/cinder-scheduler \ | 184 | ${bindir}/cinder-scheduler \ |
185 | " | 185 | " |
186 | 186 | ||
187 | FILES_${SRCNAME}-backup = " \ | 187 | FILES:${SRCNAME}-backup = " \ |
188 | ${bindir}/cinder-backup \ | 188 | ${bindir}/cinder-backup \ |
189 | " | 189 | " |
190 | 190 | ||
191 | FILES_${SRCNAME} = "${bindir}/* \ | 191 | FILES:${SRCNAME} = "${bindir}/* \ |
192 | ${sysconfdir}/${SRCNAME}/* \ | 192 | ${sysconfdir}/${SRCNAME}/* \ |
193 | ${localstatedir}/* \ | 193 | ${localstatedir}/* \ |
194 | ${sysconfdir}/${SRCNAME}/drivers/* \ | 194 | ${sysconfdir}/${SRCNAME}/drivers/* \ |
@@ -204,7 +204,7 @@ DEPENDS += " \ | |||
204 | python-pbr-native \ | 204 | python-pbr-native \ |
205 | " | 205 | " |
206 | 206 | ||
207 | RDEPENDS_${PN} += " \ | 207 | RDEPENDS:${PN} += " \ |
208 | lvm2 \ | 208 | lvm2 \ |
209 | python-pbr \ | 209 | python-pbr \ |
210 | python-babel \ | 210 | python-babel \ |
@@ -267,17 +267,17 @@ RDEPENDS_${PN} += " \ | |||
267 | python-cryptography \ | 267 | python-cryptography \ |
268 | " | 268 | " |
269 | 269 | ||
270 | RDEPENDS_${SRCNAME} = " \ | 270 | RDEPENDS:${SRCNAME} = " \ |
271 | ${PN} \ | 271 | ${PN} \ |
272 | postgresql \ | 272 | postgresql \ |
273 | postgresql-client \ | 273 | postgresql-client \ |
274 | python-psycopg2 \ | 274 | python-psycopg2 \ |
275 | tgt" | 275 | tgt" |
276 | 276 | ||
277 | RDEPENDS_${SRCNAME}-api = "${SRCNAME}" | 277 | RDEPENDS:${SRCNAME}-api = "${SRCNAME}" |
278 | RDEPENDS_${SRCNAME}-volume = "${SRCNAME}" | 278 | RDEPENDS:${SRCNAME}-volume = "${SRCNAME}" |
279 | RDEPENDS_${SRCNAME}-scheduler = "${SRCNAME}" | 279 | RDEPENDS:${SRCNAME}-scheduler = "${SRCNAME}" |
280 | RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME} bash" | 280 | RDEPENDS:${SRCNAME}-setup = "postgresql sudo ${SRCNAME} bash" |
281 | 281 | ||
282 | SYSTEMD_PACKAGES = " \ | 282 | SYSTEMD_PACKAGES = " \ |
283 | ${SRCNAME}-setup \ | 283 | ${SRCNAME}-setup \ |
@@ -287,17 +287,17 @@ SYSTEMD_PACKAGES = " \ | |||
287 | ${SRCNAME}-backup \ | 287 | ${SRCNAME}-backup \ |
288 | " | 288 | " |
289 | 289 | ||
290 | SYSTEMD_SERVICE_${SRCNAME}-setup = "cinder-init.service" | 290 | SYSTEMD_SERVICE:${SRCNAME}-setup = "cinder-init.service" |
291 | SYSTEMD_SERVICE_${SRCNAME}-api = "cinder-api.service" | 291 | SYSTEMD_SERVICE:${SRCNAME}-api = "cinder-api.service" |
292 | SYSTEMD_SERVICE_${SRCNAME}-volume = "cinder-volume.service" | 292 | SYSTEMD_SERVICE:${SRCNAME}-volume = "cinder-volume.service" |
293 | SYSTEMD_SERVICE_${SRCNAME}-scheduler = "cinder-scheduler.service" | 293 | SYSTEMD_SERVICE:${SRCNAME}-scheduler = "cinder-scheduler.service" |
294 | SYSTEMD_SERVICE_${SRCNAME}-backup = "cinder-backup.service" | 294 | SYSTEMD_SERVICE:${SRCNAME}-backup = "cinder-backup.service" |
295 | 295 | ||
296 | # Disable until they are configured (via -setup) | 296 | # Disable until they are configured (via -setup) |
297 | SYSTEMD_AUTO_ENABLE_${SRCNAME}-api = "disable" | 297 | SYSTEMD_AUTO_ENABLE:${SRCNAME}-api = "disable" |
298 | SYSTEMD_AUTO_ENABLE_${SRCNAME}-volume = "disable" | 298 | SYSTEMD_AUTO_ENABLE:${SRCNAME}-volume = "disable" |
299 | SYSTEMD_AUTO_ENABLE_${SRCNAME}-scheduler = "disable" | 299 | SYSTEMD_AUTO_ENABLE:${SRCNAME}-scheduler = "disable" |
300 | SYSTEMD_AUTO_ENABLE_${SRCNAME}-backup = "disable" | 300 | SYSTEMD_AUTO_ENABLE:${SRCNAME}-backup = "disable" |
301 | 301 | ||
302 | MONITOR_SERVICE_PACKAGES = "${SRCNAME}" | 302 | MONITOR_SERVICE_PACKAGES = "${SRCNAME}" |
303 | MONITOR_SERVICE_${SRCNAME} = "cinder" | 303 | MONITOR_SERVICE_${SRCNAME} = "cinder" |