From 90125744b49031bffb3bf7a7f190873f7c4cfdbd Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Wed, 18 Jun 2014 12:18:58 +1000
Subject: [PATCH] Define gateway for default route in $NETWORKS

It now goes into one of the ifcfg-eth* files instead of
/etc/sysconfig/network.

NetworkManager in RHEL 7.0 seems to have a horrible bug.  If GATEWAY
is defined in /etc/sysconfig/network and if it brings up the "wrong"
interface first then it adds a host route to the gateway on the
"wrong" network.  This means that outbound traffic is OK.  However,
for incoming traffic, ARP responses go out the "wrong" interface and
are either filtered on the node or are ignored by the host machine.

Signed-off-by: Martin Schwenke <martin@meltin.net>
---
 autocluster                    | 11 +++++++++++
 base/all/etc/sysconfig/network |  1 -
 config.d/00base.defconf        |  6 +++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/autocluster b/autocluster
index cb719cb..9146728 100755
--- a/autocluster
+++ b/autocluster
@@ -785,6 +785,16 @@ setup_network()
     local netname dev ip mask mac opts
     while read netname dev ip mask mac opts; do
 	echo "  $dev"
+
+	local o gw
+	gw=""
+	for o in $opts ; do
+	    case "$o" in
+		gw\=*)
+		    gw="${o#gw=}"
+	    esac
+	done
+
 	cat <<EOF | \
 	    diskimage put - "/etc/sysconfig/network-scripts/ifcfg-${dev}"
 DEVICE=$dev
@@ -793,6 +803,7 @@ TYPE=Ethernet
 IPADDR=$ip
 NETMASK=$mask
 HWADDR=$mac
+${gw:+GATEWAY=}${gw}
 EOF
 
 	# This goes to 70-persistent-net.rules
diff --git a/base/all/etc/sysconfig/network b/base/all/etc/sysconfig/network
index fac6747..482aa15 100644
--- a/base/all/etc/sysconfig/network
+++ b/base/all/etc/sysconfig/network
@@ -2,5 +2,4 @@ NETWORKING=yes
 NETWORKING_IPV6=no
 HOSTNAME=@@NAME@@.@@DOMAIN@@
 PEERDNS=no
-GATEWAY=@@GATEWAY@@
 NOZEROCONF=yes
diff --git a/config.d/00base.defconf b/config.d/00base.defconf
index eb17ba9..fd14df6 100644
--- a/config.d/00base.defconf
+++ b/config.d/00base.defconf
@@ -229,11 +229,11 @@ defconf DNSSEARCH "$DOMAIN" \
 
 # Networks:
 # * First network is private and contains the CTDB node addresses.
-# * Items look like: net/bits,dev[, nat|bridge=host_iface]
+# * Items look like: net/bits,dev[,nat|bridge=host_iface][,gw=gateway_ip]
 
-# * Right now autocluster only supported 24 bit networks.  This will
+# * Right now autocluster only supports 24 bit networks.  This will
 #   be improved in the future.
-defconf NETWORKS "10.0.0.0/24,eth0 10.0.1.0/24,eth1 10.0.2.0/24,eth2" \
+defconf NETWORKS "10.0.0.0/24,eth0,gw=10.0.0.1 10.0.1.0/24,eth1 10.0.2.0/24,eth2" \
 	"<list>" "description of IP networks"
 
 has_public_addresses_DEFAULT ()
-- 
2.34.1