linux-yocto: add nat/conntrack options to netfilter

iptables save/restore looks for the nat module, and if not present,
it fails to restore tables. This failure code causes nova-api to
not start .. and hence have no scheduler services.

We add a configuration fragment to ensure that the right modules
are built, and on the rootfs.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

3 files changed, 9 insertions, 0 deletions

diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg b/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg
new file mode 100644
index 0000000..9160ffe
--- /dev/null
+++ b/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg
@@ -0,0 +1,7 @@
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_NF_NAT_IPV4=m
diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto/nf.scc b/meta-openstack/recipes-kernel/linux/linux-yocto/nf.scc
new file mode 100644
index 0000000..d2ba875
--- /dev/null
+++ b/meta-openstack/recipes-kernel/linux/linux-yocto/nf.scc
@@ -0,0 +1 @@
+kconf non-hardware nf.cfg
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 d243d6a..e2025f1 100644
--- a/meta-openstack/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/meta-openstack/recipes-kernel/linux/linux-yocto_3.14.bbappend
@@ -5,4 +5,5 @@ SRC_URI += "file://enable-veth.cfg \
             file://enable-iscsi-tcp.cfg \
             file://enable-nbd.cfg \
             file://enable-rtlink.cfg \
+            file://nf.scc \
         "