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 | |
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>
25 files changed, 42 insertions, 42 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 |
diff --git a/meta-openstack/recipes-connectivity/openssh/openssh_7.%.bbappend b/meta-openstack/recipes-connectivity/openssh/openssh_7.%.bbappend index bfc543a..5c0d724 100644 --- a/meta-openstack/recipes-connectivity/openssh/openssh_7.%.bbappend +++ b/meta-openstack/recipes-connectivity/openssh/openssh_7.%.bbappend | |||
@@ -4,7 +4,7 @@ SRC_URI += "file://mcs-sshd" | |||
4 | SRC_URI += "file://mcs-sshd_config" | 4 | SRC_URI += "file://mcs-sshd_config" |
5 | 5 | ||
6 | do_install_append() { | 6 | do_install_append() { |
7 | if ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then | 7 | if ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then |
8 | install -D -m 644 ${WORKDIR}/mcs-sshd ${D}/etc/pam.d/sshd | 8 | install -D -m 644 ${WORKDIR}/mcs-sshd ${D}/etc/pam.d/sshd |
9 | install -D -m 644 ${WORKDIR}/mcs-sshd_config ${D}/etc/ssh/sshd_config | 9 | install -D -m 644 ${WORKDIR}/mcs-sshd_config ${D}/etc/ssh/sshd_config |
10 | fi | 10 | fi |
diff --git a/meta-openstack/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-openstack/recipes-core/base-files/base-files_3.0.14.bbappend index 53f0c20..0a1b160 100644 --- a/meta-openstack/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/meta-openstack/recipes-core/base-files/base-files_3.0.14.bbappend | |||
@@ -2,11 +2,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | |||
2 | 2 | ||
3 | SRC_URI += "file://nsswitch.conf" | 3 | SRC_URI += "file://nsswitch.conf" |
4 | 4 | ||
5 | PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" | 5 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" |
6 | PACKAGECONFIG[OpenLDAP] = ",,,nss-pam-ldapd" | 6 | PACKAGECONFIG[OpenLDAP] = ",,,nss-pam-ldapd" |
7 | 7 | ||
8 | do_install_append() { | 8 | do_install_append() { |
9 | if ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then | 9 | if ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then |
10 | install -m 755 -d ${D}/etc/ | 10 | install -m 755 -d ${D}/etc/ |
11 | install -m 644 ${WORKDIR}/nsswitch.conf ${D}/etc/ | 11 | install -m 644 ${WORKDIR}/nsswitch.conf ${D}/etc/ |
12 | fi | 12 | fi |
diff --git a/meta-openstack/recipes-devtools/python/python-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb index 15459f1..aa896ac 100644 --- a/meta-openstack/recipes-devtools/python/python-barbican_git.bb +++ b/meta-openstack/recipes-devtools/python/python-barbican_git.bb | |||
@@ -52,7 +52,7 @@ do_install_append() { | |||
52 | sed -e "s:%BARBICAN_MAX_PACKET_SIZE%:${BARBICAN_MAX_PACKET_SIZE}:g" -i ${BARBICAN_CONF_DIR}/vassals/barbican-api.ini | 52 | sed -e "s:%BARBICAN_MAX_PACKET_SIZE%:${BARBICAN_MAX_PACKET_SIZE}:g" -i ${BARBICAN_CONF_DIR}/vassals/barbican-api.ini |
53 | sed -e "s:%BARBICAN_MAX_PACKET_SIZE%:${BARBICAN_MAX_PACKET_SIZE}:g" -i ${BARBICAN_CONF_DIR}/vassals/barbican-admin.ini | 53 | sed -e "s:%BARBICAN_MAX_PACKET_SIZE%:${BARBICAN_MAX_PACKET_SIZE}:g" -i ${BARBICAN_CONF_DIR}/vassals/barbican-admin.ini |
54 | fi | 54 | fi |
55 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 55 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
56 | install -d ${D}${sysconfdir}/init.d | 56 | install -d ${D}${sysconfdir}/init.d |
57 | 57 | ||
58 | for binary in api; do | 58 | for binary in api; do |
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb index 2825e60..0d6e2d3 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb | |||
@@ -78,7 +78,7 @@ do_install_append() { | |||
78 | sed -e "s:%ADMIN_PASSWORD%:${ADMIN_PASSWORD}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf | 78 | sed -e "s:%ADMIN_PASSWORD%:${ADMIN_PASSWORD}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf |
79 | sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf | 79 | sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf |
80 | fi | 80 | fi |
81 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 81 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
82 | install -d ${D}${sysconfdir}/init.d | 82 | install -d ${D}${sysconfdir}/init.d |
83 | 83 | ||
84 | sed 's:@suffix@:api:' < ${WORKDIR}/ceilometer.init >${WORKDIR}/ceilometer-api.init.sh | 84 | sed 's:@suffix@:api:' < ${WORKDIR}/ceilometer.init >${WORKDIR}/ceilometer-api.init.sh |
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb index 3203c43..91098c4 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb | |||
@@ -92,7 +92,7 @@ do_install_append() { | |||
92 | done | 92 | done |
93 | fi | 93 | fi |
94 | 94 | ||
95 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 95 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
96 | install -d ${D}${sysconfdir}/init.d | 96 | install -d ${D}${sysconfdir}/init.d |
97 | sed 's:@suffix@:api:' < ${WORKDIR}/cinder.init >${WORKDIR}/cinder-api.init.sh | 97 | sed 's:@suffix@:api:' < ${WORKDIR}/cinder.init >${WORKDIR}/cinder-api.init.sh |
98 | install -m 0755 ${WORKDIR}/cinder-api.init.sh ${D}${sysconfdir}/init.d/cinder-api | 98 | install -m 0755 ${WORKDIR}/cinder-api.init.sh ${D}${sysconfdir}/init.d/cinder-api |
diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb index e6f5f5f..bce373d 100644 --- a/meta-openstack/recipes-devtools/python/python-glance_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb | |||
@@ -112,7 +112,7 @@ do_install_append() { | |||
112 | done | 112 | done |
113 | fi | 113 | fi |
114 | 114 | ||
115 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 115 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
116 | install -d ${D}${sysconfdir}/init.d | 116 | install -d ${D}${sysconfdir}/init.d |
117 | sed 's:@suffix@:api:' < ${WORKDIR}/glance.init >${WORKDIR}/glance-api.init.sh | 117 | sed 's:@suffix@:api:' < ${WORKDIR}/glance.init >${WORKDIR}/glance-api.init.sh |
118 | install -m 0755 ${WORKDIR}/glance-api.init.sh ${D}${sysconfdir}/init.d/glance-api | 118 | install -m 0755 ${WORKDIR}/glance-api.init.sh ${D}${sysconfdir}/init.d/glance-api |
diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb index c2b2da7..75d5ba6 100644 --- a/meta-openstack/recipes-devtools/python/python-heat_git.bb +++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb | |||
@@ -89,7 +89,7 @@ do_install_append() { | |||
89 | sed -e "s:%ADMIN_PASSWORD%:${ADMIN_PASSWORD}:g" -i ${HEAT_CONF_DIR}/heat.conf | 89 | sed -e "s:%ADMIN_PASSWORD%:${ADMIN_PASSWORD}:g" -i ${HEAT_CONF_DIR}/heat.conf |
90 | sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" -i ${HEAT_CONF_DIR}/heat.conf | 90 | sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" -i ${HEAT_CONF_DIR}/heat.conf |
91 | fi | 91 | fi |
92 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 92 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
93 | install -d ${D}${sysconfdir}/init.d | 93 | install -d ${D}${sysconfdir}/init.d |
94 | 94 | ||
95 | sed 's:@suffix@:api:' < ${WORKDIR}/heat.init >${WORKDIR}/heat-api.init.sh | 95 | sed 's:@suffix@:api:' < ${WORKDIR}/heat.init >${WORKDIR}/heat-api.init.sh |
diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb index 2a96190..01ce598 100644 --- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb +++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb | |||
@@ -107,7 +107,7 @@ do_install_append() { | |||
107 | -i ${DASHBOARD_DIR}/local/local_settings.py | 107 | -i ${DASHBOARD_DIR}/local/local_settings.py |
108 | install -m 644 ${S}/manage.py ${DASHBOARD_DIR}/manage.py | 108 | install -m 644 ${S}/manage.py ${DASHBOARD_DIR}/manage.py |
109 | 109 | ||
110 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; | 110 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; |
111 | then | 111 | then |
112 | install -d ${D}${sysconfdir}/init.d | 112 | install -d ${D}${sysconfdir}/init.d |
113 | sed 's:@PYTHON_SITEPACKAGES@:${PYTHON_SITEPACKAGES_DIR}:' \ | 113 | sed 's:@PYTHON_SITEPACKAGES@:${PYTHON_SITEPACKAGES_DIR}:' \ |
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index 4bd739a..e79a6a4 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb | |||
@@ -100,7 +100,7 @@ do_install_append() { | |||
100 | 100 | ||
101 | cp -r ${S}/examples ${KEYSTONE_PACKAGE_DIR} | 101 | cp -r ${S}/examples ${KEYSTONE_PACKAGE_DIR} |
102 | 102 | ||
103 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; | 103 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; |
104 | then | 104 | then |
105 | install -d ${D}${sysconfdir}/init.d | 105 | install -d ${D}${sysconfdir}/init.d |
106 | install -m 0755 ${WORKDIR}/keystone ${D}${sysconfdir}/init.d/keystone | 106 | install -m 0755 ${WORKDIR}/keystone ${D}${sysconfdir}/init.d/keystone |
@@ -144,7 +144,7 @@ do_install_append() { | |||
144 | -i ${KEYSTONE_PACKAGE_DIR}/tests/test_overrides.conf | 144 | -i ${KEYSTONE_PACKAGE_DIR}/tests/test_overrides.conf |
145 | fi | 145 | fi |
146 | 146 | ||
147 | if ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; | 147 | if ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; |
148 | then | 148 | then |
149 | sed -i -e '/^\[identity\]/a \ | 149 | sed -i -e '/^\[identity\]/a \ |
150 | driver = keystone.identity.backends.hybrid_identity.Identity \ | 150 | driver = keystone.identity.backends.hybrid_identity.Identity \ |
@@ -215,7 +215,7 @@ pkg_postinst_${SRCNAME}-setup () { | |||
215 | keystone-manage db_sync | 215 | keystone-manage db_sync |
216 | keystone-manage pki_setup --keystone-user=root --keystone-group=daemon | 216 | keystone-manage pki_setup --keystone-user=root --keystone-group=daemon |
217 | 217 | ||
218 | if ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then | 218 | if ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then |
219 | /etc/init.d/openldap start | 219 | /etc/init.d/openldap start |
220 | fi | 220 | fi |
221 | /etc/init.d/keystone start | 221 | /etc/init.d/keystone start |
@@ -292,7 +292,7 @@ RDEPENDS_${PN} += " \ | |||
292 | 292 | ||
293 | RDEPENDS_${SRCNAME}-tests += " bash" | 293 | RDEPENDS_${SRCNAME}-tests += " bash" |
294 | 294 | ||
295 | PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" | 295 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" |
296 | PACKAGECONFIG[OpenLDAP] = ",,,python-ldap python-keystone-hybrid-backend" | 296 | PACKAGECONFIG[OpenLDAP] = ",,,python-ldap python-keystone-hybrid-backend" |
297 | 297 | ||
298 | # TODO: | 298 | # TODO: |
diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index cadc80f..f651a8f 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb | |||
@@ -82,7 +82,7 @@ do_install_append() { | |||
82 | 82 | ||
83 | PLUGIN=openvswitch | 83 | PLUGIN=openvswitch |
84 | ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/plugins/ml2/ml2_conf.ini" | 84 | ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/plugins/ml2/ml2_conf.ini" |
85 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 85 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
86 | install -d ${D}${sysconfdir}/init.d | 86 | install -d ${D}${sysconfdir}/init.d |
87 | sed "s:@plugin@:/etc/neutron/plugins/ml2/ml2_conf.ini:" \ | 87 | sed "s:@plugin@:/etc/neutron/plugins/ml2/ml2_conf.ini:" \ |
88 | < ${WORKDIR}/neutron-server.init >${WORKDIR}/neutron-server.init.sh | 88 | < ${WORKDIR}/neutron-server.init >${WORKDIR}/neutron-server.init.sh |
@@ -93,7 +93,7 @@ do_install_append() { | |||
93 | 93 | ||
94 | AGENT=dhcp | 94 | AGENT=dhcp |
95 | ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/dhcp_agent.ini" | 95 | ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/dhcp_agent.ini" |
96 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 96 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
97 | sed "s:@suffix@:$AGENT:;s:@args@:$ARGS:" < ${WORKDIR}/neutron-agent.init >${WORKDIR}/neutron-$AGENT.init.sh | 97 | sed "s:@suffix@:$AGENT:;s:@args@:$ARGS:" < ${WORKDIR}/neutron-agent.init >${WORKDIR}/neutron-$AGENT.init.sh |
98 | install -m 0755 ${WORKDIR}/neutron-$AGENT.init.sh ${D}${sysconfdir}/init.d/neutron-$AGENT-agent | 98 | install -m 0755 ${WORKDIR}/neutron-$AGENT.init.sh ${D}${sysconfdir}/init.d/neutron-$AGENT-agent |
99 | install -m 600 ${WORKDIR}/${AGENT}_agent.ini ${NEUTRON_CONF_DIR}/ | 99 | install -m 600 ${WORKDIR}/${AGENT}_agent.ini ${NEUTRON_CONF_DIR}/ |
@@ -104,7 +104,7 @@ do_install_append() { | |||
104 | 104 | ||
105 | AGENT=l3 | 105 | AGENT=l3 |
106 | ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/l3_agent.ini" | 106 | ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/l3_agent.ini" |
107 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 107 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
108 | sed "s:@suffix@:$AGENT:;s:@args@:$ARGS:" < ${WORKDIR}/neutron-agent.init >${WORKDIR}/neutron-$AGENT.init.sh | 108 | sed "s:@suffix@:$AGENT:;s:@args@:$ARGS:" < ${WORKDIR}/neutron-agent.init >${WORKDIR}/neutron-$AGENT.init.sh |
109 | install -m 0755 ${WORKDIR}/neutron-$AGENT.init.sh ${D}${sysconfdir}/init.d/neutron-$AGENT-agent | 109 | install -m 0755 ${WORKDIR}/neutron-$AGENT.init.sh ${D}${sysconfdir}/init.d/neutron-$AGENT-agent |
110 | install -m 600 ${WORKDIR}/${AGENT}_agent.ini ${NEUTRON_CONF_DIR}/ | 110 | install -m 600 ${WORKDIR}/${AGENT}_agent.ini ${NEUTRON_CONF_DIR}/ |
@@ -112,7 +112,7 @@ do_install_append() { | |||
112 | 112 | ||
113 | AGENT=metadata | 113 | AGENT=metadata |
114 | ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/metadata_agent.ini" | 114 | ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/metadata_agent.ini" |
115 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 115 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
116 | sed "s:@suffix@:$AGENT:;s:@args@:$ARGS:" < ${WORKDIR}/neutron-agent.init >${WORKDIR}/neutron-$AGENT.init.sh | 116 | sed "s:@suffix@:$AGENT:;s:@args@:$ARGS:" < ${WORKDIR}/neutron-agent.init >${WORKDIR}/neutron-$AGENT.init.sh |
117 | install -m 0755 ${WORKDIR}/neutron-$AGENT.init.sh ${D}${sysconfdir}/init.d/neutron-$AGENT-agent | 117 | install -m 0755 ${WORKDIR}/neutron-$AGENT.init.sh ${D}${sysconfdir}/init.d/neutron-$AGENT-agent |
118 | install -m 600 ${WORKDIR}/${AGENT}_agent.ini ${NEUTRON_CONF_DIR}/ | 118 | install -m 600 ${WORKDIR}/${AGENT}_agent.ini ${NEUTRON_CONF_DIR}/ |
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index fd50173..7e0e861 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb | |||
@@ -137,7 +137,7 @@ do_install_append() { | |||
137 | fi | 137 | fi |
138 | install -o nova -d ${NOVA_CONF_DIR}/instances | 138 | install -o nova -d ${NOVA_CONF_DIR}/instances |
139 | 139 | ||
140 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 140 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
141 | install -d ${D}${sysconfdir}/init.d | 141 | install -d ${D}${sysconfdir}/init.d |
142 | 142 | ||
143 | # nova-all is installed (and packaged), but not used as an initscript by default | 143 | # nova-all is installed (and packaged), but not used as an initscript by default |
diff --git a/meta-openstack/recipes-devtools/python/python-rally_git.bb b/meta-openstack/recipes-devtools/python/python-rally_git.bb index 30e3283..d29e7cb 100644 --- a/meta-openstack/recipes-devtools/python/python-rally_git.bb +++ b/meta-openstack/recipes-devtools/python/python-rally_git.bb | |||
@@ -35,7 +35,7 @@ do_install_append() { | |||
35 | sed -e "s:%DB_USER%:${DB_USER}:g" -i ${RALLY_CONF_DIR}/rally.conf | 35 | sed -e "s:%DB_USER%:${DB_USER}:g" -i ${RALLY_CONF_DIR}/rally.conf |
36 | sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${RALLY_CONF_DIR}/rally.conf | 36 | sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${RALLY_CONF_DIR}/rally.conf |
37 | 37 | ||
38 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 38 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
39 | install -d ${D}${sysconfdir}/init.d | 39 | install -d ${D}${sysconfdir}/init.d |
40 | sed 's:@suffix@:api:' < ${WORKDIR}/rally.init > ${WORKDIR}/rally-api.init.sh | 40 | sed 's:@suffix@:api:' < ${WORKDIR}/rally.init > ${WORKDIR}/rally-api.init.sh |
41 | install -m 0755 ${WORKDIR}/rally-api.init.sh ${D}${sysconfdir}/init.d/rally-api | 41 | install -m 0755 ${WORKDIR}/rally-api.init.sh ${D}${sysconfdir}/init.d/rally-api |
diff --git a/meta-openstack/recipes-devtools/python/python-trove_git.bb b/meta-openstack/recipes-devtools/python/python-trove_git.bb index 1b8d9ac..830da92 100755 --- a/meta-openstack/recipes-devtools/python/python-trove_git.bb +++ b/meta-openstack/recipes-devtools/python/python-trove_git.bb | |||
@@ -50,7 +50,7 @@ do_install_append() { | |||
50 | install -d ${TROVE_CONF_DIR} | 50 | install -d ${TROVE_CONF_DIR} |
51 | 51 | ||
52 | # init. | 52 | # init. |
53 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; | 53 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; |
54 | then | 54 | then |
55 | install -d ${D}${sysconfdir}/init.d | 55 | install -d ${D}${sysconfdir}/init.d |
56 | for suffix in api taskmanager conductor; do | 56 | for suffix in api taskmanager conductor; do |
diff --git a/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb b/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb index 457ff93..01ee924 100644 --- a/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb +++ b/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb | |||
@@ -16,8 +16,8 @@ SRC_URI[sha256sum] = "9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65ee406c460a728092b37db | |||
16 | 16 | ||
17 | S = "${WORKDIR}/${BPN}-${PV}" | 17 | S = "${WORKDIR}/${BPN}-${PV}" |
18 | 18 | ||
19 | DISTUTILS_INSTALL_ARGS_append = " ${@base_contains('DISTRO_FEATURES', 'sysvinit', '--init-system=sysvinit_deb', '', d)}" | 19 | DISTUTILS_INSTALL_ARGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '--init-system=sysvinit_deb', '', d)}" |
20 | DISTUTILS_INSTALL_ARGS_append = " ${@base_contains('DISTRO_FEATURES', 'systemd', '--init-system=systemd', '', d)}" | 20 | DISTUTILS_INSTALL_ARGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--init-system=systemd', '', d)}" |
21 | 21 | ||
22 | MANAGE_HOSTS ?= "False" | 22 | MANAGE_HOSTS ?= "False" |
23 | HOSTNAME ?= "" | 23 | HOSTNAME ?= "" |
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 | ||
diff --git a/meta-openstack/recipes-extended/libpam/libpam_1.%.bbappend b/meta-openstack/recipes-extended/libpam/libpam_1.%.bbappend index 0e93ace..ec858a7 100644 --- a/meta-openstack/recipes-extended/libpam/libpam_1.%.bbappend +++ b/meta-openstack/recipes-extended/libpam/libpam_1.%.bbappend | |||
@@ -6,11 +6,11 @@ SRC_URI += "file://common-password" | |||
6 | SRC_URI += "file://common-session" | 6 | SRC_URI += "file://common-session" |
7 | SRC_URI += "file://common-session-noninteractive" | 7 | SRC_URI += "file://common-session-noninteractive" |
8 | 8 | ||
9 | PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" | 9 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" |
10 | PACKAGECONFIG[OpenLDAP] = ",,,pam-plugin-mkhomedir nss-pam-ldapd" | 10 | PACKAGECONFIG[OpenLDAP] = ",,,pam-plugin-mkhomedir nss-pam-ldapd" |
11 | 11 | ||
12 | do_install_append() { | 12 | do_install_append() { |
13 | if ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then | 13 | if ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then |
14 | install -m 755 -d ${D}/etc/pam.d/ | 14 | install -m 755 -d ${D}/etc/pam.d/ |
15 | install -m 644 ${WORKDIR}/common-account ${D}/etc/pam.d/ | 15 | install -m 644 ${WORKDIR}/common-account ${D}/etc/pam.d/ |
16 | install -m 644 ${WORKDIR}/common-auth ${D}/etc/pam.d/ | 16 | install -m 644 ${WORKDIR}/common-auth ${D}/etc/pam.d/ |
diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_1.%.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_1.%.bbappend index 874bfd6..b55f9a9 100644 --- a/meta-openstack/recipes-extended/libvirt/libvirt_1.%.bbappend +++ b/meta-openstack/recipes-extended/libvirt/libvirt_1.%.bbappend | |||
@@ -1,6 +1,6 @@ | |||
1 | PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \ | 1 | PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \ |
2 | python ebtables \ | 2 | python ebtables \ |
3 | ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ | 3 | ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ |
4 | " | 4 | " |
5 | 5 | ||
6 | inherit useradd | 6 | inherit useradd |
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb index 98a7348..7563792 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb | |||
@@ -20,13 +20,13 @@ RDEPENDS_${PN} = " \ | |||
20 | neutron-plugin-openvswitch \ | 20 | neutron-plugin-openvswitch \ |
21 | openvswitch-switch \ | 21 | openvswitch-switch \ |
22 | troveclient \ | 22 | troveclient \ |
23 | ${@base_contains('CINDER_EXTRA_FEATURES', 'open-iscsi-user', 'open-iscsi-user', '', d)} \ | 23 | ${@bb.utils.contains('CINDER_EXTRA_FEATURES', 'open-iscsi-user', 'open-iscsi-user', '', d)} \ |
24 | ${@base_contains('CINDER_EXTRA_FEATURES', 'iscsi-initiator-utils', 'iscsi-initiator-utils', '', d)} \ | 24 | ${@bb.utils.contains('CINDER_EXTRA_FEATURES', 'iscsi-initiator-utils', 'iscsi-initiator-utils', '', d)} \ |
25 | nfs-utils-client \ | 25 | nfs-utils-client \ |
26 | fuse \ | 26 | fuse \ |
27 | ${@base_contains('CINDER_EXTRA_FEATURES', 'glusterfs', 'glusterfs glusterfs-fuse', '', d)} \ | 27 | ${@bb.utils.contains('CINDER_EXTRA_FEATURES', 'glusterfs', 'glusterfs glusterfs-fuse', '', d)} \ |
28 | ${@base_contains('CINDER_EXTRA_FEATURES', 'ceph', 'packagegroup-ceph xfsprogs', '', d)} \ | 28 | ${@bb.utils.contains('CINDER_EXTRA_FEATURES', 'ceph', 'packagegroup-ceph xfsprogs', '', d)} \ |
29 | ${@base_contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', 'packagegroup-monitoring-agent', '', d)} \ | 29 | ${@bb.utils.contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', 'packagegroup-monitoring-agent', '', d)} \ |
30 | " | 30 | " |
31 | 31 | ||
32 | RRECOMMENDS_${PN} = " \ | 32 | RRECOMMENDS_${PN} = " \ |
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb index 5154b1d..653a493 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb | |||
@@ -50,10 +50,10 @@ RDEPENDS_${PN} = " postgresql-setup \ | |||
50 | chkconfig \ | 50 | chkconfig \ |
51 | qemu \ | 51 | qemu \ |
52 | fuse \ | 52 | fuse \ |
53 | ${@base_contains('CINDER_EXTRA_FEATURES', 'glusterfs', 'glusterfs glusterfs-fuse glusterfs-server', '', d)} \ | 53 | ${@bb.utils.contains('CINDER_EXTRA_FEATURES', 'glusterfs', 'glusterfs glusterfs-fuse glusterfs-server', '', d)} \ |
54 | ${@base_contains('CINDER_EXTRA_FEATURES', 'ceph', 'packagegroup-ceph ceph-setup xfsprogs', '', d)} \ | 54 | ${@bb.utils.contains('CINDER_EXTRA_FEATURES', 'ceph', 'packagegroup-ceph ceph-setup xfsprogs', '', d)} \ |
55 | ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'openldap python-ldap cyrus-sasl nss-pam-ldapd pam-plugin-mkhomedir python-keystone-hybrid-backend', '', d)} \ | 55 | ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'openldap python-ldap cyrus-sasl nss-pam-ldapd pam-plugin-mkhomedir python-keystone-hybrid-backend', '', d)} \ |
56 | ${@base_contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', 'packagegroup-monitoring-core', '', d)} \ | 56 | ${@bb.utils.contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', 'packagegroup-monitoring-core', '', d)} \ |
57 | " | 57 | " |
58 | 58 | ||
59 | RRECOMMENDS_${PN} = " \ | 59 | RRECOMMENDS_${PN} = " \ |
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb index 721e2c9..2fcad8b 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb | |||
@@ -8,7 +8,7 @@ inherit packagegroup | |||
8 | 8 | ||
9 | RDEPENDS_${PN} = " \ | 9 | RDEPENDS_${PN} = " \ |
10 | vim \ | 10 | vim \ |
11 | ${@base_contains('DISTRO_FEATURES', 'x11', 'xterm', '', d)} \ | 11 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xterm', '', d)} \ |
12 | " | 12 | " |
13 | 13 | ||
14 | IMAGE_FEATURES += "package-management" | 14 | IMAGE_FEATURES += "package-management" |
diff --git a/meta-openstack/recipes-support/deploychef/deploychef_0.1.bb b/meta-openstack/recipes-support/deploychef/deploychef_0.1.bb index b823514..6237538 100644 --- a/meta-openstack/recipes-support/deploychef/deploychef_0.1.bb +++ b/meta-openstack/recipes-support/deploychef/deploychef_0.1.bb | |||
@@ -55,7 +55,7 @@ FILES_${PN} += " \ | |||
55 | #Read the module config files and make them into | 55 | #Read the module config files and make them into |
56 | #chef-solo templates | 56 | #chef-solo templates |
57 | do_install() { | 57 | do_install() { |
58 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 58 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
59 | #This script will make templates out of postinst script before they | 59 | #This script will make templates out of postinst script before they |
60 | #have a chance to run | 60 | #have a chance to run |
61 | install -d ${D}${sysconfdir}/init.d | 61 | install -d ${D}${sysconfdir}/init.d |
diff --git a/meta-openstack/recipes-support/tgt/tgt_git.bb b/meta-openstack/recipes-support/tgt/tgt_git.bb index af4aa4b..5c594b1 100644 --- a/meta-openstack/recipes-support/tgt/tgt_git.bb +++ b/meta-openstack/recipes-support/tgt/tgt_git.bb | |||
@@ -28,7 +28,7 @@ do_compile() { | |||
28 | do_install() { | 28 | do_install() { |
29 | oe_runmake -e DESTDIR="${D}" install-programs install-conf install-scripts | 29 | oe_runmake -e DESTDIR="${D}" install-programs install-conf install-scripts |
30 | 30 | ||
31 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 31 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
32 | install -d ${D}${sysconfdir}/init.d | 32 | install -d ${D}${sysconfdir}/init.d |
33 | install -m 0755 ${WORKDIR}/tgtd.init ${D}${sysconfdir}/init.d/tgtd | 33 | install -m 0755 ${WORKDIR}/tgtd.init ${D}${sysconfdir}/init.d/tgtd |
34 | fi | 34 | fi |