[openstack-packstack/f20] Updated to packstack-2013.2.1dev982.tar.gz and improved MariaDB patch

[Martin Mágr]

commit f18f164f90a519259b80d023f6946a44f83f391f
Author: Martin Magr <mmagr at redhat.com>
Date:   Fri Feb 14 14:57:22 2014 +0100

    Updated to packstack-2013.2.1dev982.tar.gz and improved MariaDB patch

 .gitignore               |    1 +
 Mariadb-patch.patch      |   40 +++++++++++++++++++++++++++++++---------
 openstack-packstack.spec |    8 ++++++--
 sources                  |    2 +-
 4 files changed, 39 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a56c163..7818951 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
 /packstack-2013.2.1dev936.tar.gz
 /packstack-2013.2.1dev956.tar.gz
 /packstack-2013.2.1dev979.tar.gz
+/packstack-2013.2.1dev982.tar.gz
diff --git a/Mariadb-patch.patch b/Mariadb-patch.patch
index 5b3cfcf..b6bd064 100644
--- a/Mariadb-patch.patch
+++ b/Mariadb-patch.patch
@@ -1,26 +1,28 @@
-From 3141b95c17d895008aeb9446e80b1375ddef2f6e Mon Sep 17 00:00:00 2001
+From ef5b3d476103aef0c42bb66b29f75e85e5989ba5 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
+Date: Fri, 14 Feb 2014 14:52:32 +0100
+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(-)
+ packstack/puppet/modules/mysql/manifests/params.pp | 11 +++++++++--
+ packstack/puppet/modules/mysql/manifests/server.pp |  5 +++++
+ 2 files changed, 14 insertions(+), 2 deletions(-)
 
 diff --git a/packstack/puppet/modules/mysql/manifests/params.pp b/packstack/puppet/modules/mysql/manifests/params.pp
-index 3e2ab4b..a5ce990 100644
+index 3e2ab4b..c0fb16b 100644
 --- a/packstack/puppet/modules/mysql/manifests/params.pp
 +++ b/packstack/puppet/modules/mysql/manifests/params.pp
-@@ -36,9 +36,15 @@ class mysql::params {
+@@ -36,13 +36,20 @@ 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'
++        $log_error    = '/var/log/mariadb/mariadb.log'
 +      } else {
 +        $service_name = 'mysqld'
++        $log_error    = '/var/log/mysqld.log'
 +      }
 +
        $basedir               = '/usr'
@@ -29,5 +31,25 @@ index 3e2ab4b..a5ce990 100644
        $socket                = '/var/lib/mysql/mysql.sock'
        $pidfile               = '/var/run/mysqld/mysqld.pid'
        $config_file           = '/etc/my.cnf'
+-      $log_error             = '/var/log/mysqld.log'
+       $ruby_package_name     = 'ruby-mysql'
+       $ruby_package_provider = 'gem'
+       $python_package_name   = 'MySQL-python'
+diff --git a/packstack/puppet/modules/mysql/manifests/server.pp b/packstack/puppet/modules/mysql/manifests/server.pp
+index b900142..13b3c52 100644
+--- a/packstack/puppet/modules/mysql/manifests/server.pp
++++ b/packstack/puppet/modules/mysql/manifests/server.pp
+@@ -42,6 +42,11 @@ class mysql::server (
+   }
+ 
+   if $manage_service {
++    file { $mysql::params::log_error:
++      owner => 'mysql',
++      group => 'mysql',
++    }
++
+     service { 'mysqld':
+       ensure   => $service_ensure,
+       name     => $service_name,
 -- 
-1.8.1.4
+1.8.4.2
diff --git a/openstack-packstack.spec b/openstack-packstack.spec
index ecc60e2..5a4057b 100644
--- a/openstack-packstack.spec
+++ b/openstack-packstack.spec
@@ -1,10 +1,10 @@
 
-%global git_revno 979
+%global git_revno 982
 
 Name:           openstack-packstack
 Version:        2013.2.1
 #Release:       1%{?dist}
-Release:        0.30.dev%{git_revno}%{?dist}
+Release:        0.31.dev%{git_revno}%{?dist}
 Summary:        Openstack Install Utility
 
 Group:          Applications/System
@@ -105,6 +105,10 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
 
 
 %changelog
+* Fri Feb 14 2014 Martin Mágr <mmagr at redhat.com> - 2013.2.1-0.31.dev982
+- Fixes apache duplicated Listen statements
+- Adds back LibvirtHybridOVSBridgeDriver for OVS installations (rhbz#1052124)
+
 * Wed Feb 12 2014 Matthias Runge <mrunge at redhat.com> - 2013.2.1-0.30.dev979
 - fix build related issue on el7
 - fix bogus date in changelogs
diff --git a/sources b/sources
index 4411741..bb7c21e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81d1d2d016e65c9d070413f32244ac25  packstack-2013.2.1dev979.tar.gz
+5c1c91bcafb5a219384b632ce93076cc  packstack-2013.2.1dev982.tar.gz