From bd2525ceb47699747f9370773fa629bf28c999d6 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Wed, 21 Dec 2016 10:22:41 -0500 Subject: housekeeping: replace deprecated base_contains Fixes: base_contains is deprecated, please use bb.utils.contains instead. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- meta-openstack/classes/identity.bbclass | 2 +- meta-openstack/classes/monitor.bbclass | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-openstack/classes') diff --git a/meta-openstack/classes/identity.bbclass b/meta-openstack/classes/identity.bbclass index 3601f52..97f778f 100644 --- a/meta-openstack/classes/identity.bbclass +++ b/meta-openstack/classes/identity.bbclass @@ -22,7 +22,7 @@ ADMIN_USER_EMAIL = "admin@domain.com" MEMBER_ROLE = "Member" -RUN_POSTINSTS_FILE = "${@base_contains('DISTRO_FEATURES', 'sysvinit', '/etc/rcS.d/S99run-postinsts', '', d)}" +RUN_POSTINSTS_FILE = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '/etc/rcS.d/S99run-postinsts', '', d)}" # Add service and user setup into S99run-postinst running list ROOTFS_POSTPROCESS_COMMAND += "update_run_postinsts ; " diff --git a/meta-openstack/classes/monitor.bbclass b/meta-openstack/classes/monitor.bbclass index e916137..e217780 100644 --- a/meta-openstack/classes/monitor.bbclass +++ b/meta-openstack/classes/monitor.bbclass @@ -25,7 +25,7 @@ def copy_check_files(d, check_var_name, src, dest): python do_monitor_install() { import shutil - if base_contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', "0", "1", d) == "1": + if bb.utils.contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', "0", "1", d) == "1": bb.debug(1, 'OpenStack monitoring feature is disabled, skipping do_monitor_install') return @@ -85,7 +85,7 @@ python do_monitor_clean() { } monitor_rootfs_postprocess() { - if ${@base_contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', "false", "true", d)}; then + if ${@bb.utils.contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', "false", "true", d)}; then echo "OpenStack monitoring feature is disabled, skipping monitor_rootfs_postprocess" exit fi -- cgit v1.2.3-54-g00ecf