[openstack-tripleo-image-elements] Updated patches from master-patches

[slagle]

commit 015d3ba02dc6e9c672b0e26b48e6a440b730222f
Author: James Slagle <jslagle at redhat.com>
Date:   Mon Sep 29 16:14:44 2014 -0400

    Updated patches from master-patches

 0002-Add-network-gateway-element.patch |   70 ++++++++++++++++++++++++++++++++
 openstack-tripleo-image-elements.spec  |    2 +
 2 files changed, 72 insertions(+), 0 deletions(-)
---
diff --git a/0002-Add-network-gateway-element.patch b/0002-Add-network-gateway-element.patch
new file mode 100644
index 0000000..2abfd7c
--- /dev/null
+++ b/0002-Add-network-gateway-element.patch
@@ -0,0 +1,70 @@
+From 03c1f18ab1b8f32f5333157d680ee1085df2e492 Mon Sep 17 00:00:00 2001
+From: James Slagle <jslagle at redhat.com>
+Date: Fri, 26 Sep 2014 09:40:31 -0400
+Subject: [PATCH] Add network-gateway element
+
+Add a new element that allows a gateway device to be set.  Allows
+setting a default route other than the one offered by the DHCP lease
+from Neutron's DHCP. Useful for when a default route is needed that may
+offer access to other networks that may be needed.
+
+Change-Id: I62b874e37070e4ee2e4557fee0bb06faa4264483
+Closes-Bug: 1354570
+---
+ elements/network-gateway/README.md                 | 15 ++++++++++++++
+ .../configure.d/25-set-network-gateway             | 24 ++++++++++++++++++++++
+ 2 files changed, 39 insertions(+)
+ create mode 100644 elements/network-gateway/README.md
+ create mode 100755 elements/network-gateway/os-refresh-config/configure.d/25-set-network-gateway
+
+diff --git a/elements/network-gateway/README.md b/elements/network-gateway/README.md
+new file mode 100644
+index 0000000..5e7066a
+--- /dev/null
++++ b/elements/network-gateway/README.md
+@@ -0,0 +1,15 @@
++network-gateway
++===============
++
++The network-gateway element allows for setting a network interface that will be
++used as the default gateway. This is useful in deployments where they may be
++external DHCP services offering leases, and the deployer would like to make the
++route from one of those leases the default.
++
++Currently only supported on ifcfg network configuration style systems.
++
++Configuration
++=============
++
++network-config:
++  gateway-dev: eth1
+diff --git a/elements/network-gateway/os-refresh-config/configure.d/25-set-network-gateway b/elements/network-gateway/os-refresh-config/configure.d/25-set-network-gateway
+new file mode 100755
+index 0000000..67d4b23
+--- /dev/null
++++ b/elements/network-gateway/os-refresh-config/configure.d/25-set-network-gateway
+@@ -0,0 +1,24 @@
++#!/bin/bash
++
++# This script must run after init-neutron-ovs, otherwise the default route may
++# be overwritten.
++
++set -eux
++set -o pipefail
++
++new_gatewaydev=$(os-apply-config --key network-config.gateway-dev --type raw --key-default '')
++
++if [ -z "$new_gatewaydev" ]; then
++    echo "\$new_gatewaydev not set"
++    exit 0
++fi
++
++if grep -e "^\s*GATEWAYDEV=" /etc/sysconfig/network; then
++    sed -i "s/GATEWAYDEV=.*/GATEWAYDEV=$new_gatewaydev/" /etc/sysconfig/network
++else
++    echo "GATEWAYDEV=$new_gatewaydev" >> /etc/sysconfig/network
++fi
++
++# Restart the device to pick up the change immediately.
++ifdown $new_gatewaydev
++ifup $new_gatewaydev
diff --git a/openstack-tripleo-image-elements.spec b/openstack-tripleo-image-elements.spec
index a9214f7..2d68a26 100644
--- a/openstack-tripleo-image-elements.spec
+++ b/openstack-tripleo-image-elements.spec
@@ -11,6 +11,7 @@ URL:		https://wiki.openstack.org/wiki/TripleO
 Source0:	http://tarballs.openstack.org/tripleo-image-elements/tripleo-image-elements-%{version}.tar.gz
 
 Patch0001: 0001-Cinder-conf-patch.patch
+Patch0002: 0002-Add-network-gateway-element.patch
 
 BuildArch:	noarch
 BuildRequires:	python
@@ -28,6 +29,7 @@ program.
 %setup -q -n tripleo-image-elements-%{version}
 
 %patch0001 -p1
+%patch0002 -p1
 
 %build
 %{__python} setup.py build