[openstack-packstack/f20] Add enable-epel.patch only applied for rhel

[Gael Chamoulaud]

commit de297379b2cbca2c3badf75f88baff1fc9726e79
Author: Gael Chamoulaud <gchamoul at redhat.com>
Date:   Mon Oct 27 12:29:06 2014 +0100

    Add enable-epel.patch only applied for rhel
    
    Signed-off-by: Gael Chamoulaud <gchamoul at redhat.com>

 enable-epel.patch        |   18 ++++++++++++++++++
 openstack-packstack.spec |   10 +++++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/enable-epel.patch b/enable-epel.patch
new file mode 100644
index 0000000..d1f4c5e
--- /dev/null
+++ b/enable-epel.patch
@@ -0,0 +1,18 @@
+RDO requires EPEL, so enable that.
+
+Also install the RDO release rpm, so that it's present on all hosts,
+not just the host that packstack was initiated on.
+
+diff --git a/packstack/plugins/serverprep_001.py b/packstack/plugins/serverprep_001.py
+index f4018a7..bbf9570 100644
+--- a/packstack/plugins/serverprep_001.py
++++ b/packstack/plugins/serverprep_001.py
+@@ -32,7 +32,7 @@ def initConfig(controller):
+              "PROMPT": "To subscribe each server to EPEL enter \"y\"",
+              "OPTION_LIST": ["y", "n"],
+              "VALIDATORS": [validators.validate_options],
+-             "DEFAULT_VALUE": "n",
++             "DEFAULT_VALUE": "y",
+              "MASK_INPUT": False,
+              "LOOSE_VALIDATION": True,
+              "CONF_NAME": "CONFIG_USE_EPEL",
diff --git a/openstack-packstack.spec b/openstack-packstack.spec
index 175a503..c97f84f 100644
--- a/openstack-packstack.spec
+++ b/openstack-packstack.spec
@@ -6,7 +6,7 @@
 
 Name:           openstack-packstack
 Version:        2013.2.1
-Release:        0.37.dev%{git_revno}%{?dist}
+Release:        0.38.dev%{git_revno}%{?dist}
 Summary:        Openstack Install Utility
 
 Group:          Applications/System
@@ -15,6 +15,8 @@ URL:            https://github.com/stackforge/packstack
 # Tarball is created by bin/release.sh
 Source0:        http://mmagr.fedorapeople.org/downloads/packstack/packstack-%{version}dev%{git_revno}.tar.gz
 
+Patch0:         enable-epel.patch
+
 BuildArch:      noarch
 
 BuildRequires:  python2-devel
@@ -63,6 +65,9 @@ This package contains documentation files for Packstack.
 
 %prep
 %setup -n packstack-%{version}dev%{git_revno}
+%if 0%{?rhel}
+%patch0 -p1
+%endif
 
 # Sanitizing a lot of the files in the puppet modules, they come from seperate upstream projects
 find packstack/puppet/modules \( -name .fixtures.yml -o -name .gemfile -o -name ".travis.yml" -o -name .rspec \) -exec rm {} +
@@ -134,6 +139,9 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
 # changelog --------------------------------------------------------------------
 
 %changelog
+* Mon Oct 27 2014 Gael Chamoulaud <gchamoul at redhat.com> - 2013.2.1-0.38.dev1048
+- Add enable-epel.patch only applied for rhel.
+
 * Tue Oct 14 2014 Martin Mágr <mmagr at redhat.com> - 2013.2.1-0.37.dev1048
 - [Keystone] Use a valid e-mail for admin user in keystone (rhbz#1020199)
 - [MySQL] Reverts InnoDB performance tuning patches (rhbz#1150104)