From fbc0ca6e73d501f4dcb94eb8303f3906d3cc2fca Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 30 Apr 2014 00:06:05 -0400 Subject: linux-yocto: enable NBD and RTLINK support Signed-off-by: Bruce Ashfield --- ...paste.ini-make-controller-IP-configurable.patch | 26 ---------------------- .../linux/linux-yocto/enable-nbd.cfg | 1 + .../linux/linux-yocto/enable-rtlink.cfg | 1 + .../recipes-kernel/linux/linux-yocto_3.14.bbappend | 6 +++-- 4 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 meta-openstack/recipes-devtools/python/python-nova/0001-nova-api-paste.ini-make-controller-IP-configurable.patch create mode 100644 meta-openstack/recipes-kernel/linux/linux-yocto/enable-nbd.cfg create mode 100644 meta-openstack/recipes-kernel/linux/linux-yocto/enable-rtlink.cfg (limited to 'meta-openstack') diff --git a/meta-openstack/recipes-devtools/python/python-nova/0001-nova-api-paste.ini-make-controller-IP-configurable.patch b/meta-openstack/recipes-devtools/python/python-nova/0001-nova-api-paste.ini-make-controller-IP-configurable.patch deleted file mode 100644 index 7d2ed7e..0000000 --- a/meta-openstack/recipes-devtools/python/python-nova/0001-nova-api-paste.ini-make-controller-IP-configurable.patch +++ /dev/null @@ -1,26 +0,0 @@ -From dd200f769d745ed4cb02faf40ebc32252046d783 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Wed, 28 Aug 2013 01:38:16 -0400 -Subject: [PATCH] nova/api-paste.ini: make controller IP configurable - -Signed-off-by: Bruce Ashfield ---- - etc/nova/api-paste.ini | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/nova/api-paste.ini b/etc/nova/api-paste.ini -index 34c87b9..c770408 100644 ---- a/etc/nova/api-paste.ini -+++ b/etc/nova/api-paste.ini -@@ -98,7 +98,7 @@ paste.filter_factory = nova.api.auth:NovaKeystoneContext.factory - - [filter:authtoken] - paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory --auth_host = 127.0.0.1 -+auth_host = %CONTROLLER_IP% - auth_port = 35357 - auth_protocol = http - admin_tenant_name = %SERVICE_TENANT_NAME% --- -1.7.10.4 - diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto/enable-nbd.cfg b/meta-openstack/recipes-kernel/linux/linux-yocto/enable-nbd.cfg new file mode 100644 index 0000000..af37685 --- /dev/null +++ b/meta-openstack/recipes-kernel/linux/linux-yocto/enable-nbd.cfg @@ -0,0 +1 @@ +CONFIG_BLK_DEV_NBD=y diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto/enable-rtlink.cfg b/meta-openstack/recipes-kernel/linux/linux-yocto/enable-rtlink.cfg new file mode 100644 index 0000000..d8f8f5b --- /dev/null +++ b/meta-openstack/recipes-kernel/linux/linux-yocto/enable-rtlink.cfg @@ -0,0 +1 @@ +CONFIG_IP_ADVANCED_ROUTER=y diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto_3.14.bbappend b/meta-openstack/recipes-kernel/linux/linux-yocto_3.14.bbappend index 2d7c60f..d243d6a 100644 --- a/meta-openstack/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ b/meta-openstack/recipes-kernel/linux/linux-yocto_3.14.bbappend @@ -1,6 +1,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" PRINC := "${@int(PRINC) + 1}" -SRC_URI += "file://iscsi-tcp.scc \ - file://enable-iscsi-tcp.cfg \ +SRC_URI += "file://enable-veth.cfg \ + file://enable-iscsi-tcp.cfg \ + file://enable-nbd.cfg \ + file://enable-rtlink.cfg \ " -- cgit v1.2.3-54-g00ecf