From cdb13c5dde409b5fd1e821aef569e26ee2a18f25 Mon Sep 17 00:00:00 2001 From: Sam Stoelinga Date: Tue, 14 Jul 2015 21:29:39 +0800 Subject: [PATCH] Load nf_conntrack_proto_gre kernel module default Add nf_conntrack_proto_gre to the default loaded modules for CentOS and Ubuntu. This enables VMs on OpenStack that use GRE to provide GRE connectivity over floating IPs. Closes-bug: #1474210 Change-Id: I265a30d698396bcce64b139dfa8696a440cc2a3b --- cloud-init-templates/boothook_centos.jinja2 | 2 ++ cloud-init-templates/boothook_ubuntu.jinja2 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cloud-init-templates/boothook_centos.jinja2 b/cloud-init-templates/boothook_centos.jinja2 index 538d656..ce7fe45 100644 --- a/cloud-init-templates/boothook_centos.jinja2 +++ b/cloud-init-templates/boothook_centos.jinja2 @@ -48,11 +48,13 @@ fi cloud-init-per instance conntrack_ipv4 /bin/sh -c 'echo nf_conntrack_ipv4 | tee -a /etc/rc.modules' cloud-init-per instance conntrack_ipv6 /bin/sh -c 'echo nf_conntrack_ipv6 | tee -a /etc/rc.modules' +cloud-init-per instance conntrack_proto_gre /bin/sh -c 'echo nf_conntrack_proto_gre | tee -a /etc/rc.modules' cloud-init-per instance chmod_rc_modules chmod +x /etc/rc.modules cloud-init-per instance conntrack_max /bin/sh -c 'echo "net.nf_conntrack_max=1048576" | tee -a /etc/sysctl.conf' cloud-init-per instance conntrack_ipv4_load modprobe nf_conntrack_ipv4 cloud-init-per instance conntrack_ipv6_load modprobe nf_conntrack_ipv6 +cloud-init-per instance conntrack_proto_gre_load modprobe nf_conntrack_proto_gre cloud-init-per instance conntrack_max_set sysctl -w "net.nf_conntrack_max=1048576" cloud-init-per instance mkdir_coredump mkdir -p /var/log/coredump diff --git a/cloud-init-templates/boothook_ubuntu.jinja2 b/cloud-init-templates/boothook_ubuntu.jinja2 index 5a0be72..d6b6847 100644 --- a/cloud-init-templates/boothook_ubuntu.jinja2 +++ b/cloud-init-templates/boothook_ubuntu.jinja2 @@ -55,10 +55,12 @@ fi cloud-init-per instance conntrack_ipv4 /bin/sh -c 'echo nf_conntrack_ipv4 | tee -a /etc/modules' cloud-init-per instance conntrack_ipv6 /bin/sh -c 'echo nf_conntrack_ipv6 | tee -a /etc/modules' +cloud-init-per instance conntrack_proto_gre /bin/sh -c 'echo nf_conntrack_proto_gre | tee -a /etc/modules' cloud-init-per instance conntrack_max /bin/sh -c 'echo "net.nf_conntrack_max=1048576" | tee -a /etc/sysctl.conf' cloud-init-per instance conntrack_ipv4_load modprobe nf_conntrack_ipv4 cloud-init-per instance conntrack_ipv6_load modprobe nf_conntrack_ipv6 +cloud-init-per instance conntrack_proto_gre_load modprobe nf_conntrack_proto_gre cloud-init-per instance conntrack_max_set sysctl -w "net.nf_conntrack_max=1048576" cloud-init-per instance dhclient /bin/sh -c 'echo "supersede routers 0;" | tee /etc/dhcp/dhclient.conf'