[openstack-packstack/f20] Added patches required for Fedora 20

[Martin Mágr]

commit dcbc3ec9dedcc9e53924431acb28ac7d71eeb027
Author: Martin Magr <mmagr at redhat.com>
Date:   Thu Oct 17 21:34:14 2013 +0200

    Added patches required for Fedora 20

 Changed-the-settings-for-qpid-0.24.patch |   27 ++++++++++++++++++++++++
 Mariadb-patch.patch                      |   33 ++++++++++++++++++++++++++++++
 openstack-packstack.spec                 |   10 ++++++++-
 3 files changed, 69 insertions(+), 1 deletions(-)
---
diff --git a/Changed-the-settings-for-qpid-0.24.patch b/Changed-the-settings-for-qpid-0.24.patch
new file mode 100644
index 0000000..4e0d01f
--- /dev/null
+++ b/Changed-the-settings-for-qpid-0.24.patch
@@ -0,0 +1,27 @@
+From eaea473c2e59eeeff2849080b89934ba369abb4c Mon Sep 17 00:00:00 2001
+From: Francesco Vollero <fvollero at redhat.com>
+Date: Thu, 17 Oct 2013 18:25:18 +0200
+Subject: [PATCH] qpid: Changed the settings for qpid >= 0.24
+
+Change-Id: I18fecf162b8fa9b7c54750691349e3a3e5bf1b64
+---
+ packstack/puppet/templates/qpid.pp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/packstack/puppet/templates/qpid.pp b/packstack/puppet/templates/qpid.pp
+index 1dd901a..9f83549 100644
+--- a/packstack/puppet/templates/qpid.pp
++++ b/packstack/puppet/templates/qpid.pp
+@@ -1,5 +1,9 @@
+ 
+ class {"qpid::server":
++    config_file => $::operatingsystem? {
++        'Fedora' => '/etc/qpid/qpidd.conf',
++        default  => '/etc/qpidd.conf',
++        },
+     auth => "no",
+     clustered => false,
+ }
+-- 
+1.8.1.4
+
diff --git a/Mariadb-patch.patch b/Mariadb-patch.patch
new file mode 100644
index 0000000..5b3cfcf
--- /dev/null
+++ b/Mariadb-patch.patch
@@ -0,0 +1,33 @@
+From 3141b95c17d895008aeb9446e80b1375ddef2f6e Mon Sep 17 00:00:00 2001
+From: Martin Magr <mmagr at redhat.com>
+Date: Thu, 17 Oct 2013 17:17:37 +0200
+Subject: [PATCH] Mariadb patch
+
+Service name also differs in case of Fedora 19+
+---
+ packstack/puppet/modules/mysql/manifests/params.pp | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/packstack/puppet/modules/mysql/manifests/params.pp b/packstack/puppet/modules/mysql/manifests/params.pp
+index 3e2ab4b..a5ce990 100644
+--- a/packstack/puppet/modules/mysql/manifests/params.pp
++++ b/packstack/puppet/modules/mysql/manifests/params.pp
+@@ -36,9 +36,15 @@ class mysql::params {
+         $client_package_name = 'mysql'
+         $server_package_name = 'mysql-server'
+       }
++
++      if $::operatingsystem == 'Fedora' and (is_integer($::operatingsystemrelease) and $::operatingsystemrelease >= 20 or $::operatingsystemrelease == "Rawhide") {
++        $service_name = 'mariadb'
++      } else {
++        $service_name = 'mysqld'
++      }
++
+       $basedir               = '/usr'
+       $datadir               = '/var/lib/mysql'
+-      $service_name          = 'mysqld'
+       $socket                = '/var/lib/mysql/mysql.sock'
+       $pidfile               = '/var/run/mysqld/mysqld.pid'
+       $config_file           = '/etc/my.cnf'
+-- 
+1.8.1.4
diff --git a/openstack-packstack.spec b/openstack-packstack.spec
index 9652ce6..9b52da3 100644
--- a/openstack-packstack.spec
+++ b/openstack-packstack.spec
@@ -4,7 +4,7 @@
 Name:           openstack-packstack
 Version:        2013.2.1
 #Release:       1%{?dist}
-Release:        0.11.dev%{git_revno}%{?dist}
+Release:        0.12.dev%{git_revno}%{?dist}
 Summary:        Openstack Install Utility
 
 Group:          Applications/System
@@ -12,6 +12,8 @@ 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
+Patch0:         Mariadb-patch.patch
+Patch1:         Changed-the-settings-for-qpid-0.24.patch
 
 BuildArch:      noarch
 
@@ -44,6 +46,9 @@ Set of Puppet modules used by Packstack to install OpenStack
 #%setup -n packstack-%{version}
 %setup -n packstack-%{version}dev%{git_revno}
 
+%patch0 -p1
+%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 {} +
@@ -100,6 +105,9 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
 
 
 %changelog
+* Tue Oct 17 2013 Martin Mágr <mmagr at redhat.com> - 2013.2.1-0.12.dev806
+- Added patches required for Fedora 20
+
 * Tue Oct 17 2013 Martin Mágr <mmagr at redhat.com> - 2013.2.1-0.11.dev806
 - Improved logging (lp#1228187)
 - Adds error checking when puppet fails internally (rhbz#958587)