[openstack-packstack] el6-grizzly build: enable EPEL by default

[Martin Mágr]

commit 2594869bf40f39ee35ac386ed0903c1818900934
Author: Martin Magr <mmagr at redhat.com>
Date:   Mon Apr 15 10:35:43 2013 +0200

    el6-grizzly build: enable EPEL by default

 enable-epel-and-el6-grizzly.patch |   20 ++++++++++++++++++++
 openstack-packstack.spec          |    9 ++++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/enable-epel-and-el6-grizzly.patch b/enable-epel-and-el6-grizzly.patch
new file mode 100644
index 0000000..433af4b
--- /dev/null
+++ b/enable-epel-and-el6-grizzly.patch
@@ -0,0 +1,20 @@
+diff -ru packstack-2013.1.1dev538.orig/packstack/plugins/serverprep_901.py packstack-2013.1.1dev538/packstack/plugins/serverprep_901.py
+--- packstack-2013.1.1dev538.orig/packstack/plugins/serverprep_901.py	2013-04-09 04:47:16.000000000 -0700
++++ packstack-2013.1.1dev538/packstack/plugins/serverprep_901.py	2013-04-14 17:30:53.044132006 -0700
+@@ -35,7 +35,7 @@
+                    "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",
+@@ -410,6 +410,7 @@
+             server.append("grep -e 'Red Hat Enterprise Linux' -e 'CentOS' -e 'Scientific Linux' /etc/redhat-release && "
+                           "( rpm -q epel-release || yum install -y --nogpg -c $REPOFILE epel-release ) || echo -n ''")
+             server.append("rm -rf $REPOFILE")
++            server.append("( rpm -q rdo-release-grizzly || yum install -y --nogpg http://repos.fedorapeople.org/repos/openstack/openstack-grizzly/rdo-release-grizzly-1.noarch.rpm ) || echo -n ''")
+ 
+ 
+         # set highest priority of RHOS repository if EPEL is installed and
diff --git a/openstack-packstack.spec b/openstack-packstack.spec
index aa82714..b2563ac 100644
--- a/openstack-packstack.spec
+++ b/openstack-packstack.spec
@@ -4,7 +4,7 @@
 Name:           openstack-packstack
 Version:        2013.1.1
 #Release:       1%{?dist}
-Release:        0.4.dev%{git_revno}%{?dist}
+Release:        0.5.dev%{git_revno}%{?dist}
 Summary:        Openstack Install Utility
 
 Group:          Applications/System
@@ -12,6 +12,7 @@ License:        ASL 2.0 and GPLv2
 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
+Patch1:         enable-epel-and-el6-grizzly.patch
 
 BuildArch:      noarch
 
@@ -43,6 +44,9 @@ Set of Puppet modules used by Packstack to install OpenStack
 #%setup -n packstack-%{version}
 %setup -n packstack-%{version}dev%{git_revno}
 
+# el6-grizzly build: enabled EPEL and el6-grizzly repos by default
+%patch1 -p1
+
 # 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 {} \;
 find packstack/puppet/modules \( -name "*.py" -o -name "*.rb" -o -name "*.pl" \) -exec sed -i '/^#!/{d;q}' {} \; -exec chmod -x {} \;
@@ -99,6 +103,9 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
 
 
 %changelog
+* Mon Apr 15 2013 Alan Pevec <apevec at redhat.com> 2013.1.1-0.5.dev538
+- enable EPEL and el6-grizzly by default
+
 * Tue Apr 09 2013 Martin Mágr <mmagr at redhat.com> - 2013.1.1-0.4.dev538
 - Updated to  packstack-2013.1.1dev538.tar.gz
 - Fixes: rhbz#946915, rhbz#947427