summaryrefslogtreecommitdiffstats
path: root/meta-openstack/classes/monitor.bbclass
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2016-12-21 10:22:41 -0500
committerBruce Ashfield <bruce.ashfield@windriver.com>2016-12-21 11:47:05 -0500
commitbd2525ceb47699747f9370773fa629bf28c999d6 (patch)
tree1748ce0f1e237277440967a405e7145ca42876c3 /meta-openstack/classes/monitor.bbclass
parentd2a69f5e890b040cbc774f64275c27c8a1ea67a9 (diff)
downloadmeta-cloud-services-bd2525ceb47699747f9370773fa629bf28c999d6.tar.gz
housekeeping: replace deprecated base_contains
Fixes: base_contains is deprecated, please use bb.utils.contains instead. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/classes/monitor.bbclass')
-rw-r--r--meta-openstack/classes/monitor.bbclass4
1 files changed, 2 insertions, 2 deletions
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):
25python do_monitor_install() { 25python do_monitor_install() {
26 import shutil 26 import shutil
27 27
28 if base_contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', "0", "1", d) == "1": 28 if bb.utils.contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', "0", "1", d) == "1":
29 bb.debug(1, 'OpenStack monitoring feature is disabled, skipping do_monitor_install') 29 bb.debug(1, 'OpenStack monitoring feature is disabled, skipping do_monitor_install')
30 return 30 return
31 31
@@ -85,7 +85,7 @@ python do_monitor_clean() {
85} 85}
86 86
87monitor_rootfs_postprocess() { 87monitor_rootfs_postprocess() {
88 if ${@base_contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', "false", "true", d)}; then 88 if ${@bb.utils.contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', "false", "true", d)}; then
89 echo "OpenStack monitoring feature is disabled, skipping monitor_rootfs_postprocess" 89 echo "OpenStack monitoring feature is disabled, skipping monitor_rootfs_postprocess"
90 exit 90 exit
91 fi 91 fi