diff options
Diffstat (limited to 'meta-openstack/classes')
| -rw-r--r-- | meta-openstack/classes/identity.bbclass | 2 | ||||
| -rw-r--r-- | meta-openstack/classes/monitor.bbclass | 4 |
2 files changed, 3 insertions, 3 deletions
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" | |||
| 22 | 22 | ||
| 23 | MEMBER_ROLE = "Member" | 23 | MEMBER_ROLE = "Member" |
| 24 | 24 | ||
| 25 | RUN_POSTINSTS_FILE = "${@base_contains('DISTRO_FEATURES', 'sysvinit', '/etc/rcS.d/S99run-postinsts', '', d)}" | 25 | RUN_POSTINSTS_FILE = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '/etc/rcS.d/S99run-postinsts', '', d)}" |
| 26 | 26 | ||
| 27 | # Add service and user setup into S99run-postinst running list | 27 | # Add service and user setup into S99run-postinst running list |
| 28 | ROOTFS_POSTPROCESS_COMMAND += "update_run_postinsts ; " | 28 | 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): | |||
| 25 | python do_monitor_install() { | 25 | python 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 | ||
| 87 | monitor_rootfs_postprocess() { | 87 | monitor_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 |
