diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-keystone_git.bb')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-keystone_git.bb | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index a8cc944..e533fcd 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb | |||
@@ -32,7 +32,7 @@ SERVICE_TOKEN = "password" | |||
32 | TOKEN_FORMAT ?= "PKI" | 32 | TOKEN_FORMAT ?= "PKI" |
33 | 33 | ||
34 | USERADD_PACKAGES = "${PN}" | 34 | USERADD_PACKAGES = "${PN}" |
35 | USERADD_PARAM_${PN} = "--system -m -s /bin/false keystone" | 35 | USERADD_PARAM:${PN} = "--system -m -s /bin/false keystone" |
36 | 36 | ||
37 | LDAP_DN ?= "dc=my-domain,dc=com" | 37 | LDAP_DN ?= "dc=my-domain,dc=com" |
38 | 38 | ||
@@ -65,7 +65,7 @@ python () { | |||
65 | d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags) | 65 | d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags) |
66 | } | 66 | } |
67 | 67 | ||
68 | do_install_append() { | 68 | do_install:append() { |
69 | 69 | ||
70 | KEYSTONE_CONF_DIR=${D}${sysconfdir}/keystone | 70 | KEYSTONE_CONF_DIR=${D}${sysconfdir}/keystone |
71 | KEYSTONE_PACKAGE_DIR=${D}${PYTHON_SITEPACKAGES_DIR}/keystone | 71 | KEYSTONE_PACKAGE_DIR=${D}${PYTHON_SITEPACKAGES_DIR}/keystone |
@@ -191,7 +191,7 @@ role_tree_dn = ou=Roles,${LDAP_DN} \ | |||
191 | # this token flush cronjob to run every 2 days | 191 | # this token flush cronjob to run every 2 days |
192 | KEYSTONE_TOKEN_FLUSH_TIME ??= "0 0 */2 * *" | 192 | KEYSTONE_TOKEN_FLUSH_TIME ??= "0 0 */2 * *" |
193 | 193 | ||
194 | pkg_postinst_${SRCNAME}-cronjobs () { | 194 | pkg_postinst:${SRCNAME}-cronjobs () { |
195 | if [ -z "$D" ]; then | 195 | if [ -z "$D" ]; then |
196 | # By default keystone expired tokens are not automatic removed out of the | 196 | # By default keystone expired tokens are not automatic removed out of the |
197 | # database. So we create a cronjob for cleaning these expired tokens. | 197 | # database. So we create a cronjob for cleaning these expired tokens. |
@@ -202,20 +202,20 @@ pkg_postinst_${SRCNAME}-cronjobs () { | |||
202 | PACKAGES += " ${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-cronjobs" | 202 | PACKAGES += " ${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-cronjobs" |
203 | 203 | ||
204 | SYSTEMD_PACKAGES += "${SRCNAME}-setup" | 204 | SYSTEMD_PACKAGES += "${SRCNAME}-setup" |
205 | SYSTEMD_SERVICE_${SRCNAME}-setup = "keystone-init.service" | 205 | SYSTEMD_SERVICE:${SRCNAME}-setup = "keystone-init.service" |
206 | 206 | ||
207 | FILES_${SRCNAME}-setup = " \ | 207 | FILES:${SRCNAME}-setup = " \ |
208 | ${systemd_unitdir}/system \ | 208 | ${systemd_unitdir}/system \ |
209 | " | 209 | " |
210 | 210 | ||
211 | ALLOW_EMPTY_${SRCNAME}-cronjobs = "1" | 211 | ALLOW_EMPTY:${SRCNAME}-cronjobs = "1" |
212 | 212 | ||
213 | FILES_${PN} = "${libdir}/* \ | 213 | FILES:${PN} = "${libdir}/* \ |
214 | " | 214 | " |
215 | 215 | ||
216 | FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh" | 216 | FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh" |
217 | 217 | ||
218 | FILES_${SRCNAME} = "${bindir}/* \ | 218 | FILES:${SRCNAME} = "${bindir}/* \ |
219 | ${sysconfdir}/${SRCNAME}/* \ | 219 | ${sysconfdir}/${SRCNAME}/* \ |
220 | ${localstatedir}/* \ | 220 | ${localstatedir}/* \ |
221 | ${datadir}/openstack-dashboard/openstack_dashboard/api/keystone-httpd.py \ | 221 | ${datadir}/openstack-dashboard/openstack_dashboard/api/keystone-httpd.py \ |
@@ -232,7 +232,7 @@ DEPENDS += " \ | |||
232 | python-pbr-native \ | 232 | python-pbr-native \ |
233 | " | 233 | " |
234 | 234 | ||
235 | RDEPENDS_${PN} += " \ | 235 | RDEPENDS:${PN} += " \ |
236 | python-babel \ | 236 | python-babel \ |
237 | python-pbr \ | 237 | python-pbr \ |
238 | python-webob \ | 238 | python-webob \ |
@@ -271,7 +271,7 @@ RDEPENDS_${PN} += " \ | |||
271 | python-pytz \ | 271 | python-pytz \ |
272 | " | 272 | " |
273 | 273 | ||
274 | RDEPENDS_${SRCNAME}-tests += " bash" | 274 | RDEPENDS:${SRCNAME}-tests += " bash" |
275 | 275 | ||
276 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" | 276 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" |
277 | PACKAGECONFIG[OpenLDAP] = ",,,python-ldap python-keystone-hybrid-backend" | 277 | PACKAGECONFIG[OpenLDAP] = ",,,python-ldap python-keystone-hybrid-backend" |
@@ -279,7 +279,7 @@ PACKAGECONFIG[OpenLDAP] = ",,,python-ldap python-keystone-hybrid-backend" | |||
279 | # TODO: | 279 | # TODO: |
280 | # if DISTRO_FEATURE contains "tempest" then add *-tests to the main RDEPENDS | 280 | # if DISTRO_FEATURE contains "tempest" then add *-tests to the main RDEPENDS |
281 | 281 | ||
282 | RDEPENDS_${SRCNAME} = " \ | 282 | RDEPENDS:${SRCNAME} = " \ |
283 | ${PN} \ | 283 | ${PN} \ |
284 | postgresql \ | 284 | postgresql \ |
285 | postgresql-client \ | 285 | postgresql-client \ |
@@ -287,8 +287,8 @@ RDEPENDS_${SRCNAME} = " \ | |||
287 | apache2 \ | 287 | apache2 \ |
288 | " | 288 | " |
289 | 289 | ||
290 | RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}" | 290 | RDEPENDS:${SRCNAME}-setup = "postgresql sudo ${SRCNAME}" |
291 | RDEPENDS_${SRCNAME}-cronjobs = "cronie ${SRCNAME}" | 291 | RDEPENDS:${SRCNAME}-cronjobs = "cronie ${SRCNAME}" |
292 | 292 | ||
293 | MONITOR_SERVICE_PACKAGES = "${SRCNAME}" | 293 | MONITOR_SERVICE_PACKAGES = "${SRCNAME}" |
294 | MONITOR_SERVICE_${SRCNAME} = "keystone" | 294 | MONITOR_SERVICE_${SRCNAME} = "keystone" |