diff options
Diffstat (limited to 'meta-openstack/recipes-extended')
10 files changed, 51 insertions, 46 deletions
diff --git a/meta-openstack/recipes-extended/iptables/iptables_1.8.%.bbappend b/meta-openstack/recipes-extended/iptables/iptables_1.8.%.bbappend index 2a53557a..025ee4ee 100644 --- a/meta-openstack/recipes-extended/iptables/iptables_1.8.%.bbappend +++ b/meta-openstack/recipes-extended/iptables/iptables_1.8.%.bbappend @@ -1,3 +1 @@ -RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \ - kernel-module-xt-redirect \ - " +require ${@bb.utils.contains('DISTRO_FEATURES', 'openstack', '${BPN}_openstack.inc', '', d)} diff --git a/meta-openstack/recipes-extended/iptables/iptables_openstack.inc b/meta-openstack/recipes-extended/iptables/iptables_openstack.inc new file mode 100644 index 00000000..2a53557a --- /dev/null +++ b/meta-openstack/recipes-extended/iptables/iptables_openstack.inc @@ -0,0 +1,3 @@ +RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \ + kernel-module-xt-redirect \ + " diff --git a/meta-openstack/recipes-extended/libpam/libpam_1.%.bbappend b/meta-openstack/recipes-extended/libpam/libpam_1.%.bbappend index ec858a7f..025ee4ee 100644 --- a/meta-openstack/recipes-extended/libpam/libpam_1.%.bbappend +++ b/meta-openstack/recipes-extended/libpam/libpam_1.%.bbappend @@ -1,21 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += "file://common-account" -SRC_URI += "file://common-auth" -SRC_URI += "file://common-password" -SRC_URI += "file://common-session" -SRC_URI += "file://common-session-noninteractive" - -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" -PACKAGECONFIG[OpenLDAP] = ",,,pam-plugin-mkhomedir nss-pam-ldapd" - -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then - install -m 755 -d ${D}/etc/pam.d/ - install -m 644 ${WORKDIR}/common-account ${D}/etc/pam.d/ - install -m 644 ${WORKDIR}/common-auth ${D}/etc/pam.d/ - install -m 644 ${WORKDIR}/common-password ${D}/etc/pam.d/ - install -m 644 ${WORKDIR}/common-session ${D}/etc/pam.d/ - install -m 644 ${WORKDIR}/common-session-noninteractive ${D}/etc/pam.d/ - fi -} +require ${@bb.utils.contains('DISTRO_FEATURES', 'openstack', '${BPN}_openstack.inc', '', d)} diff --git a/meta-openstack/recipes-extended/libpam/libpam_openstack.inc b/meta-openstack/recipes-extended/libpam/libpam_openstack.inc new file mode 100644 index 00000000..ec858a7f --- /dev/null +++ b/meta-openstack/recipes-extended/libpam/libpam_openstack.inc @@ -0,0 +1,21 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI += "file://common-account" +SRC_URI += "file://common-auth" +SRC_URI += "file://common-password" +SRC_URI += "file://common-session" +SRC_URI += "file://common-session-noninteractive" + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" +PACKAGECONFIG[OpenLDAP] = ",,,pam-plugin-mkhomedir nss-pam-ldapd" + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then + install -m 755 -d ${D}/etc/pam.d/ + install -m 644 ${WORKDIR}/common-account ${D}/etc/pam.d/ + install -m 644 ${WORKDIR}/common-auth ${D}/etc/pam.d/ + install -m 644 ${WORKDIR}/common-password ${D}/etc/pam.d/ + install -m 644 ${WORKDIR}/common-session ${D}/etc/pam.d/ + install -m 644 ${WORKDIR}/common-session-noninteractive ${D}/etc/pam.d/ + fi +} diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_5.%.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_5.%.bbappend index 0b0f0114..025ee4ee 100644 --- a/meta-openstack/recipes-extended/libvirt/libvirt_5.%.bbappend +++ b/meta-openstack/recipes-extended/libvirt/libvirt_5.%.bbappend @@ -1,13 +1 @@ -PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \ - python ebtables \ - ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ - " - -inherit useradd -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN}_append = " ;--system libvirt" - -do_install_append() { - sed -e "s:^#unix_sock_group =:unix_sock_group =:g" -i ${D}/etc/libvirt/libvirtd.conf - sed -e "s:^#unix_sock_rw_perms =:unix_sock_rw_perms =:g" -i ${D}/etc/libvirt/libvirtd.conf -} +require ${@bb.utils.contains('DISTRO_FEATURES', 'openstack', '${BPN}_openstack.inc', '', d)} diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_openstack.inc b/meta-openstack/recipes-extended/libvirt/libvirt_openstack.inc new file mode 100644 index 00000000..0b0f0114 --- /dev/null +++ b/meta-openstack/recipes-extended/libvirt/libvirt_openstack.inc @@ -0,0 +1,13 @@ +PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \ + python ebtables \ + ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ + " + +inherit useradd +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN}_append = " ;--system libvirt" + +do_install_append() { + sed -e "s:^#unix_sock_group =:unix_sock_group =:g" -i ${D}/etc/libvirt/libvirtd.conf + sed -e "s:^#unix_sock_rw_perms =:unix_sock_rw_perms =:g" -i ${D}/etc/libvirt/libvirtd.conf +} diff --git a/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.%.bbappend b/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.%.bbappend index 33b1f61c..025ee4ee 100644 --- a/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.%.bbappend +++ b/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.%.bbappend @@ -1,3 +1 @@ -do_install_append() { - sed -i '2i port=`grep "^server.port" /etc/lighttpd.conf`; if [ -z $port ]; then echo "server port not configured, not running lighttpd..."; exit 0; fi' ${D}/etc/init.d/lighttpd -} +require ${@bb.utils.contains('DISTRO_FEATURES', 'openstack', '${BPN}_openstack.inc', '', d)} diff --git a/meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc b/meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc new file mode 100644 index 00000000..33b1f61c --- /dev/null +++ b/meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc @@ -0,0 +1,3 @@ +do_install_append() { + sed -i '2i port=`grep "^server.port" /etc/lighttpd.conf`; if [ -z $port ]; then echo "server port not configured, not running lighttpd..."; exit 0; fi' ${D}/etc/init.d/lighttpd +} diff --git a/meta-openstack/recipes-extended/sysklogd/sysklogd_2.%.bbappend b/meta-openstack/recipes-extended/sysklogd/sysklogd_2.%.bbappend index 8da640f5..025ee4ee 100644 --- a/meta-openstack/recipes-extended/sysklogd/sysklogd_2.%.bbappend +++ b/meta-openstack/recipes-extended/sysklogd/sysklogd_2.%.bbappend @@ -1,6 +1 @@ -# -# Copyright (C) 2014 Wind River Systems, Inc. -# - -require recipes-extended/syslog/syslog-user.inc - +require ${@bb.utils.contains('DISTRO_FEATURES', 'openstack', '${BPN}_openstack.inc', '', d)} diff --git a/meta-openstack/recipes-extended/sysklogd/sysklogd_openstack.inc b/meta-openstack/recipes-extended/sysklogd/sysklogd_openstack.inc new file mode 100644 index 00000000..8da640f5 --- /dev/null +++ b/meta-openstack/recipes-extended/sysklogd/sysklogd_openstack.inc @@ -0,0 +1,6 @@ +# +# Copyright (C) 2014 Wind River Systems, Inc. +# + +require recipes-extended/syslog/syslog-user.inc + |