[openstack-puppet-modules/icehouse-epel7] Force utf8 as default for heat and neutron

[Ivan Chavero]

commit c4f4128aec11f5d58a38e53e0ab52575e7944f6e
Author: Ivan Chavero <ichavero at redhat.com>
Date:   Wed Mar 26 08:53:53 2014 -0700

    Force utf8 as default for heat and neutron
    
    Set the default charset to utf8 for the neutron and
    heat databases.
    
    Conflicts:
    	openstack-puppet-modules.spec

 heat.patch                    |   13 +++++++++++++
 neutron.patch                 |   13 +++++++++++++
 openstack-puppet-modules.spec |   19 +++++++++++++++++--
 3 files changed, 43 insertions(+), 2 deletions(-)
---
diff --git a/heat.patch b/heat.patch
new file mode 100644
index 0000000..0646f4a
--- /dev/null
+++ b/heat.patch
@@ -0,0 +1,13 @@
+diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
+index 8441e60..e4417b0 100644
+--- a/manifests/db/mysql.pp
++++ b/manifests/db/mysql.pp
+@@ -29,7 +29,7 @@ class heat::db::mysql(
+   $user          = 'heat',
+   $host          = 'localhost',
+   $allowed_hosts = undef,
+-  $charset       = 'latin1'
++  $charset       = 'utf8'
+ ) {
+ 
+   validate_string($password)
diff --git a/neutron.patch b/neutron.patch
new file mode 100644
index 0000000..4403dd9
--- /dev/null
+++ b/neutron.patch
@@ -0,0 +1,13 @@
+diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
+index 82273ae..e2130f0 100644
+--- a/manifests/db/mysql.pp
++++ b/manifests/db/mysql.pp
+@@ -5,7 +5,7 @@ class neutron::db::mysql (
+   $user          = 'neutron',
+   $host          = '127.0.0.1',
+   $allowed_hosts = undef,
+-  $charset       = 'latin1',
++  $charset       = 'utf8',
+   $cluster_id    = 'localzone'
+ ) {
+ 
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index a08dcc5..573d961 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -37,7 +37,7 @@
 
 Name:           openstack-puppet-modules
 Version:        2014.1
-Release:        5.1%{?dist}
+Release:        5.2%{?dist}
 Summary:        Puppet modules used to deploy OpenStack
 License:        ASL 2.0 and GPLv2 and GPLv3
 
@@ -85,7 +85,8 @@ Patch2:     compute_driver.patch
 Patch3:     el7-nova.patch
 Patch4:     el7-cinder.patch
 Patch5:     glance.patch
-
+Patch6:     heat.patch
+Patch7:     neutron.patch
 
 BuildArch:      noarch
 
@@ -151,6 +152,17 @@ cd %{_builddir}/%{name}-%{version}/puppet-cinder-%{cinder_commit}
 cd %{_builddir}/%{name}-%{version}/puppet-glance-%{glance_commit}
 %patch5 -p1
 
+# puppet-heat patches
+cd %{_builddir}/%{name}-%{version}/puppet-heat-%{heat_commit}
+%patch5 -p1
+
+# puppet-neutron patches
+cd %{_builddir}/%{name}-%{version}/puppet-neutron-%{neutron_commit}
+%patch6 -p1
+
+
+
+
 find %{_builddir} -type f -name ".*" -exec rm {} +
 find %{_builddir} -size 0 -exec rm {} +
 find %{_builddir} \( -name "*.pl" -o -name "*.sh"  \) -exec chmod +x {} +
@@ -206,6 +218,9 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
 
 
 %changelog
+* Wed Mar 26 2014 Iván Chavero <ichavero at redhat.com> - 2014.1-5.2
+- Added glance.patch
+
 * Mon Mar 24 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-5.1
 - Added glance.patch