[openstack-tripleo-image-elements] Make rdo-release install safe

[slagle]

commit a558bbfa21a0f4268cd6020d99b78f14529751f4
Author: James Slagle <jslagle at redhat.com>
Date:   Tue Oct 21 13:01:03 2014 -0400

    Make rdo-release install safe

 0008-Make-rdo-release-install-safe.patch |   27 +++++++++++++++++++++++++++
 openstack-tripleo-image-elements.spec    |    7 ++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/0008-Make-rdo-release-install-safe.patch b/0008-Make-rdo-release-install-safe.patch
new file mode 100644
index 0000000..e10614b
--- /dev/null
+++ b/0008-Make-rdo-release-install-safe.patch
@@ -0,0 +1,27 @@
+From 2c32c016d9ec7fa0f70bc405b1d53a504f28fc27 Mon Sep 17 00:00:00 2001
+From: Ben Nemec <bnemec at redhat.com>
+Date: Mon, 20 Oct 2014 15:41:50 -0500
+Subject: [PATCH] Make rdo-release install safe
+
+Like the epel element, this may be applied to a system that already
+has rdo-release installed.  If that happens yum exits non-zero
+because for some reason it considers "nothing to do" to be an error.
+
+This simply checks for the existence of the rdo-release rpm before
+attempting to install it.
+
+Change-Id: I5867ca074cc1afa843ef1e0f85c1c9b6f2deb403
+---
+ elements/rdo-release/pre-install.d/10-rdo-release-repo | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/elements/rdo-release/pre-install.d/10-rdo-release-repo b/elements/rdo-release/pre-install.d/10-rdo-release-repo
+index 41acde7..8defa81 100755
+--- a/elements/rdo-release/pre-install.d/10-rdo-release-repo
++++ b/elements/rdo-release/pre-install.d/10-rdo-release-repo
+@@ -2,4 +2,4 @@
+ 
+ set -eux
+ 
+-install-packages http://rdo.fedorapeople.org/openstack-$RDO_RELEASE/rdo-release-$RDO_RELEASE.rpm
++rpm -q rdo-release || install-packages http://rdo.fedorapeople.org/openstack-$RDO_RELEASE/rdo-release-$RDO_RELEASE.rpm
diff --git a/openstack-tripleo-image-elements.spec b/openstack-tripleo-image-elements.spec
index e0c8436..6cf060b 100644
--- a/openstack-tripleo-image-elements.spec
+++ b/openstack-tripleo-image-elements.spec
@@ -4,7 +4,7 @@
 Name:		openstack-tripleo-image-elements
 Summary:	OpenStack TripleO Image Elements for diskimage-builder
 Version:	0.8.10
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		https://wiki.openstack.org/wiki/TripleO
@@ -17,6 +17,7 @@ Patch0004: 0004-SELinux-Fix-mnt-state-var-log-keepalived-context.patch
 Patch0005: 0005-Ensure-neutron-rootwrap.d-symlink-is-not-nested.patch
 Patch0006: 0006-Add-package-install-support-for-tuskar.patch
 Patch0007: 0007-Add-package-install-support-for-tuskar-ui.patch
+Patch0008: 0008-Make-rdo-release-install-safe.patch
 
 BuildArch:	noarch
 BuildRequires:	python
@@ -40,6 +41,7 @@ program.
 %patch0005 -p1
 %patch0006 -p1
 %patch0007 -p1
+%patch0008 -p1
 
 %build
 %{__python} setup.py build
@@ -90,6 +92,9 @@ fi
 %{_datadir}/tripleo-image-elements
 
 %changelog
+* Tue Oct 21 2014 James Slagle <jslagle at redhat.com> 0.8.10-2
+- Make rdo-release install safe
+
 * Mon Oct 20 2014 James Slagle <jslagle at redhat.com> 0.8.10-1
 - Update to upstream 0.8.10