diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2016-12-21 10:22:41 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-12-21 11:47:05 -0500 |
commit | bd2525ceb47699747f9370773fa629bf28c999d6 (patch) | |
tree | 1748ce0f1e237277440967a405e7145ca42876c3 /meta-openstack/recipes-extended/images | |
parent | d2a69f5e890b040cbc774f64275c27c8a1ea67a9 (diff) | |
download | meta-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/recipes-extended/images')
-rw-r--r-- | meta-openstack/recipes-extended/images/openstack-image-aio.bb | 2 | ||||
-rw-r--r-- | meta-openstack/recipes-extended/images/openstack-image-controller.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-openstack/recipes-extended/images/openstack-image-aio.bb b/meta-openstack/recipes-extended/images/openstack-image-aio.bb index ec34770..2df8536 100644 --- a/meta-openstack/recipes-extended/images/openstack-image-aio.bb +++ b/meta-openstack/recipes-extended/images/openstack-image-aio.bb | |||
@@ -17,7 +17,7 @@ IMAGE_INSTALL = " \ | |||
17 | ${OPENSTACK_CONTROLLER_EXTRA_INSTALL} \ | 17 | ${OPENSTACK_CONTROLLER_EXTRA_INSTALL} \ |
18 | ${OPENSTACK_COMPUTE_EXTRA_INSTALL} \ | 18 | ${OPENSTACK_COMPUTE_EXTRA_INSTALL} \ |
19 | ${OPENSTACK_AIO_EXTRA_INSTALL} \ | 19 | ${OPENSTACK_AIO_EXTRA_INSTALL} \ |
20 | ${@base_contains('OPENSTACK_EXTRA_FEATURES', 'benchmarking', 'task-cloud-benchmarking', '', d)} \ | 20 | ${@bb.utils.contains('OPENSTACK_EXTRA_FEATURES', 'benchmarking', 'task-cloud-benchmarking', '', d)} \ |
21 | " | 21 | " |
22 | 22 | ||
23 | IMAGE_FEATURES += "ssh-server-openssh" | 23 | IMAGE_FEATURES += "ssh-server-openssh" |
diff --git a/meta-openstack/recipes-extended/images/openstack-image-controller.bb b/meta-openstack/recipes-extended/images/openstack-image-controller.bb index 879e6cc..89a4d07 100644 --- a/meta-openstack/recipes-extended/images/openstack-image-controller.bb +++ b/meta-openstack/recipes-extended/images/openstack-image-controller.bb | |||
@@ -11,7 +11,7 @@ IMAGE_INSTALL = "\ | |||
11 | packagegroup-cloud-network \ | 11 | packagegroup-cloud-network \ |
12 | packagegroup-cloud-debug \ | 12 | packagegroup-cloud-debug \ |
13 | packagegroup-cloud-extras \ | 13 | packagegroup-cloud-extras \ |
14 | ${@base_contains('OPENSTACK_EXTRA_FEATURES', 'benchmarking', 'packagegroup-cloud-benchmarking', '', d)} \ | 14 | ${@bb.utils.contains('OPENSTACK_EXTRA_FEATURES', 'benchmarking', 'packagegroup-cloud-benchmarking', '', d)} \ |
15 | ${OPENSTACK_CONTROLLER_EXTRA_INSTALL} \ | 15 | ${OPENSTACK_CONTROLLER_EXTRA_INSTALL} \ |
16 | " | 16 | " |
17 | 17 | ||