[openstack-puppet-modules/f21] Updated patches from redhat-openstack/f21-patches

[Gael Chamoulaud]

commit d0cbed94fd6a98c37d65cba41d52bc8024f09f56
Author: Gael Chamoulaud <gchamoul at redhat.com>
Date:   Mon Feb 16 15:37:31 2015 +0100

    Updated patches from redhat-openstack/f21-patches
    
    Signed-off-by: Gael Chamoulaud <gchamoul at redhat.com>

 0026-Fix-against-mongodb-2.6.5-from-epel.patch |   37 ++++++++++++++++++++++++
 openstack-puppet-modules.spec                  |    7 ++++-
 2 files changed, 43 insertions(+), 1 deletions(-)
---
diff --git a/0026-Fix-against-mongodb-2.6.5-from-epel.patch b/0026-Fix-against-mongodb-2.6.5-from-epel.patch
new file mode 100644
index 0000000..f6981af
--- /dev/null
+++ b/0026-Fix-against-mongodb-2.6.5-from-epel.patch
@@ -0,0 +1,37 @@
+From fc58b47ac6b1261bc7e99279ce9cc24cd806803b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ivan=20Ne=C4=8Das?= <inecas at redhat.com>
+Date: Tue, 25 Nov 2014 18:14:37 +0100
+Subject: [PATCH] Fix against mongodb 2.6.5 from epel
+
+The updated version of mongodb-server in epel7 2.6.5 (resp. it's
+systemd script) expects the pid file to be at
+/var/run/mongodb/mongod.pid.
+
+We expect the same to happen in fedora 22
+
+(cherry picked from commit c0a0e1613a1a1dd00ed9ee2a060d35c2308c2805)
+
+Conflicts:
+	mongodb/manifests/params.pp
+---
+ mongodb/manifests/params.pp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/mongodb/manifests/params.pp b/mongodb/manifests/params.pp
+index 50abeff..2937b37 100644
+--- a/mongodb/manifests/params.pp
++++ b/mongodb/manifests/params.pp
+@@ -40,7 +40,12 @@ class mongodb::params inherits mongodb::globals {
+         $dbpath              = '/var/lib/mongodb'
+         $logpath             = '/var/log/mongodb/mongodb.log'
+         $bind_ip             = pick($bind_ip, ['127.0.0.1'])
+-        $pidfilepath         = '/var/run/mongodb/mongodb.pid'
++        if ($::operatingsystem == 'fedora' and versioncmp($::operatingsystemrelease, '22') >= 0 or
++            $::operatingsystem != 'fedora' and versioncmp($::operatingsystemrelease, '7.0') >= 0) {
++          $pidfilepath         = '/var/run/mongodb/mongod.pid'
++        } else {
++          $pidfilepath         = '/var/run/mongodb/mongodb.pid'
++        }
+         $fork                = true
+         $journal             = true
+       }
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index abc054d..261c831 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -1,7 +1,7 @@
 
 Name:           openstack-puppet-modules
 Version:        2014.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Collection of Puppet modules for OpenStack deployment
 License:        ASL 2.0 and GPLv2 and GPLv3
 
@@ -34,6 +34,7 @@ Patch0022: 0022-nova-vlan-is-not-the-same-as-vlan_start.patch
 Patch0023: 0023-neutron-New-manifest-file-to-deploy-Cisco-N1KV-VEM.patch
 Patch0024: 0024-vswitch-Fixed-issue-with-vlan-on-redhat-provider.patch
 Patch0025: 0025-Fix-the-subnet-dhcp-enable-disable-param.patch
+Patch0026: 0026-Fix-against-mongodb-2.6.5-from-epel.patch
 
 BuildArch:      noarch
 Requires:       rubygem-json
@@ -71,6 +72,7 @@ OpenStack via installers using Puppet configuration tool.
 %patch0023 -p1
 %patch0024 -p1
 %patch0025 -p1
+%patch0026 -p1
 
 find %{_builddir}/%{name}-%{version}/ -type f -name ".*" -exec rm {} +
 find %{_builddir}/%{name}-%{version}/ -size 0 -exec rm {} +
@@ -136,6 +138,9 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
 
 
 %changelog
+* Mon Feb 16 2014 Gaël Chamoulaud <gchamoul at redhat.com> 2014.1.1-3
+- Added 0026-Fix-against-mongodb-2.6.5-from-epel.patch
+
 * Wed Dec 10 2014 Iván Chavero <ichavero at redhat.com> 2014.1.1-2
 - Added 0025-Fix-the-subnet-dhcp-enable-disable-param.patch