[openstack-puppet-modules/el6-havana] Added patches for uft8 default charset
Ivan Chavero
ichavero at fedoraproject.org
Thu Apr 3 23:36:51 UTC 2014
commit a5dfb0e019ddd965b0b80cf30951c5511aa6be7d
Author: Ivan Chavero <ichavero at redhat.com>
Date: Wed Apr 2 18:27:01 2014 -0700
Added patches for uft8 default charset
cinder.patch | 26 ++++++++++++++++++++++
glance.patch | 26 ++++++++++++++++++++++
heat.patch | 35 +++++++++++++++++++++++++++++
keystone.patch | 26 ++++++++++++++++++++++
neutron.patch | 13 +++++++++++
nova.patch | 35 +++++++++++++++++++++++++++++
openstack-puppet-modules.spec | 48 ++++++++++++++++++++++++++++++++++++++++-
openstack.patch | 48 +++++++++++++++++++++++++++++++++++++++++
8 files changed, 256 insertions(+), 1 deletions(-)
---
diff --git a/cinder.patch b/cinder.patch
new file mode 100644
index 0000000..40c8563
--- /dev/null
+++ b/cinder.patch
@@ -0,0 +1,26 @@
+diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
+index 3cc850c..8654307 100644
+--- a/manifests/db/mysql.pp
++++ b/manifests/db/mysql.pp
+@@ -5,7 +5,7 @@ class cinder::db::mysql (
+ $user = 'cinder',
+ $host = '127.0.0.1',
+ $allowed_hosts = undef,
+- $charset = 'latin1',
++ $charset = 'utf8',
+ $cluster_id = 'localzone'
+ ) {
+
+diff --git a/spec/classes/cinder_db_mysql_spec.rb b/spec/classes/cinder_db_mysql_spec.rb
+index a35b16c..9227986 100644
+--- a/spec/classes/cinder_db_mysql_spec.rb
++++ b/spec/classes/cinder_db_mysql_spec.rb
+@@ -22,7 +22,7 @@ describe 'cinder::db::mysql' do
+ :user => 'cinder',
+ :password => 'pw',
+ :host => '127.0.0.1',
+- :charset => 'latin1'
++ :charset => 'utf8'
+ ) }
+ end
+ describe "overriding allowed_hosts param to array" do
diff --git a/glance.patch b/glance.patch
new file mode 100644
index 0000000..c974387
--- /dev/null
+++ b/glance.patch
@@ -0,0 +1,26 @@
+diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
+index c190912..e1a2651 100644
+--- a/manifests/db/mysql.pp
++++ b/manifests/db/mysql.pp
+@@ -8,7 +8,7 @@ class glance::db::mysql(
+ $user = 'glance',
+ $host = '127.0.0.1',
+ $allowed_hosts = undef,
+- $charset = 'latin1',
++ $charset = 'utf8',
+ $cluster_id = 'localzone'
+ ) {
+
+diff --git a/spec/classes/glance_db_mysql_spec.rb b/spec/classes/glance_db_mysql_spec.rb
+index ace9fcc..bcb87d9 100644
+--- a/spec/classes/glance_db_mysql_spec.rb
++++ b/spec/classes/glance_db_mysql_spec.rb
+@@ -23,7 +23,7 @@ describe 'glance::db::mysql' do
+ it { should contain_mysql__db('glance').with(
+ :password => 'glancepass1',
+ :require => 'Class[Mysql::Config]',
+- :charset => 'latin1'
++ :charset => 'utf8'
+ )}
+
+ end
diff --git a/heat.patch b/heat.patch
new file mode 100644
index 0000000..410c690
--- /dev/null
+++ b/heat.patch
@@ -0,0 +1,35 @@
+diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
+index 8441e60..2e35e43 100644
+--- a/manifests/db/mysql.pp
++++ b/manifests/db/mysql.pp
+@@ -21,7 +21,7 @@
+ # Optional. Defaults to undef.
+ #
+ # [*charset*]
+-# the database charset. Optional. Defaults to 'latin1'
++# the database charset. Optional. Defaults to 'utf8'
+ #
+ class heat::db::mysql(
+ $password = false,
+@@ -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/spec/classes/heat_db_mysql_spec.rb b/spec/classes/heat_db_mysql_spec.rb
+index ae53a31..f4141be 100644
+--- a/spec/classes/heat_db_mysql_spec.rb
++++ b/spec/classes/heat_db_mysql_spec.rb
+@@ -14,7 +14,7 @@ describe 'heat::db::mysql' do
+ :dbname => 'heat',
+ :user => 'heat',
+ :host => 'localhost',
+- :charset => 'latin1'
++ :charset => 'utf8'
+ }
+ end
+
diff --git a/keystone.patch b/keystone.patch
new file mode 100644
index 0000000..ddc409c
--- /dev/null
+++ b/keystone.patch
@@ -0,0 +1,26 @@
+diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
+index 7294c89..a965a96 100644
+--- a/manifests/db/mysql.pp
++++ b/manifests/db/mysql.pp
+@@ -35,7 +35,7 @@ class keystone::db::mysql(
+ $dbname = 'keystone',
+ $user = 'keystone',
+ $host = '127.0.0.1',
+- $charset = 'latin1',
++ $charset = 'utf8',
+ $allowed_hosts = undef
+ ) {
+
+diff --git a/spec/classes/keystone_db_mysql_spec.rb b/spec/classes/keystone_db_mysql_spec.rb
+index 6422f3f..585b54c 100644
+--- a/spec/classes/keystone_db_mysql_spec.rb
++++ b/spec/classes/keystone_db_mysql_spec.rb
+@@ -15,7 +15,7 @@ describe 'keystone::db::mysql' do
+ 'password' => 'keystone_default_password',
+ 'dbname' => 'keystone',
+ 'user' => 'keystone',
+- 'charset' => 'latin1',
++ 'charset' => 'utf8',
+ 'host' => '127.0.0.1',
+ 'allowed_hosts' => ['127.0.0.%', '192.168.1.%']
+ }
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/nova.patch b/nova.patch
new file mode 100644
index 0000000..8b3d37d
--- /dev/null
+++ b/nova.patch
@@ -0,0 +1,35 @@
+diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
+index 3f20081..d64086a 100644
+--- a/manifests/db/mysql.pp
++++ b/manifests/db/mysql.pp
+@@ -6,7 +6,7 @@ class nova::db::mysql(
+ $dbname = 'nova',
+ $user = 'nova',
+ $host = '127.0.0.1',
+- $charset = 'latin1',
++ $charset = 'utf8',
+ $allowed_hosts = undef,
+ $cluster_id = 'localzone'
+ ) {
+diff --git a/spec/classes/nova_db_mysql_spec.rb b/spec/classes/nova_db_mysql_spec.rb
+index 3eb6ff2..00572bf 100644
+--- a/spec/classes/nova_db_mysql_spec.rb
++++ b/spec/classes/nova_db_mysql_spec.rb
+@@ -23,7 +23,7 @@ describe 'nova::db::mysql' do
+ it { should contain_mysql__db('nova').with(
+ :user => 'nova',
+ :password => 'qwerty',
+- :charset => 'latin1',
++ :charset => 'utf8',
+ :require => "Class[Mysql::Config]"
+ )}
+ end
+@@ -50,7 +50,7 @@ describe 'nova::db::mysql' do
+ it { should contain_mysql__db('nova').with(
+ :user => 'nova',
+ :password => 'qwerty',
+- :charset => 'latin1',
++ :charset => 'utf8',
+ :require => "Class[Mysql::Config]"
+ )}
+ end
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index 0ff74b2..1b8beda 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -35,7 +35,7 @@
Name: openstack-puppet-modules
Version: 2013.2
-Release: 8.2%{?dist}
+Release: 8.3%{?dist}
Summary: Puppet modules used to deploy OpenStack
License: ASL 2.0 and GPLv2 and GPLv3
@@ -81,6 +81,13 @@ Patch2: 0001-Fix-network_vlan_ranges-parameter-for-OVS-plugin.patch
Patch3: 0002-Change-dhcp_lease_duration-to-Havana-default-of-8640.patch
Patch4: 0003-Do-not-create-symblic-link-for-cisco-plugin.patch
Patch5: puppet-neutron-vlan_ranges.patch
+Patch6: glance.patch
+Patch7: heat.patch
+Patch8: neutron.patch
+Patch9: openstack.patch
+Patch10: cinder.patch
+Patch11: keystone.patch
+Patch12: nova.patch
BuildArch: noarch
@@ -138,6 +145,35 @@ cd %{_builddir}/%{name}-%{version}/puppet-neutron-%{neutron_commit}
%patch4 -p1
%patch5 -p1
+# puppet-glance patches
+cd %{_builddir}/%{name}-%{version}/puppet-glance-%{glance_commit}
+%patch6 -p1
+
+# puppet-heat patches
+cd %{_builddir}/%{name}-%{version}/puppet-heat-%{heat_commit}
+%patch7 -p1
+
+# puppet-neutron patches
+cd %{_builddir}/%{name}-%{version}/puppet-neutron-%{neutron_commit}
+%patch8 -p1
+
+# puppet-openstack patches
+cd %{_builddir}/%{name}-%{version}/puppet-openstack-%{openstack_commit}
+%patch9 -p1
+
+# puppet-cinder patches
+cd %{_builddir}/%{name}-%{version}/puppet-cinder-%{cinder_commit}
+%patch10 -p1
+
+# puppet-keystone patches
+cd %{_builddir}/%{name}-%{version}/puppet-keystone-%{keystone_commit}
+%patch11 -p1
+
+# puppet-nova patches
+cd %{_builddir}/%{name}-%{version}/puppet-nova-%{nova_commit}
+%patch12 -p1
+
+
find %{_builddir} -type f -name ".*" -exec rm {} +
find %{_builddir} -size 0 -exec rm {} +
find %{_builddir} \( -name "*.pl" -o -name "*.sh" \) -exec chmod +x {} +
@@ -191,6 +227,16 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
%changelog
+* Wed Apr 2 2014 Iván Chavero <ichavero at redhat.com> - 2013.2-8.3
+- Added patches to make utf8 the default charset
+- Added cinder.patch
+- Added glance.patch
+- Added heat.patch
+- Added keystone.patch
+- Added neutron.patch
+- Added nova.patch
+- Added openstack.patch
+
* Wed Apr 2 2014 Martin Mágr <mmagr at redhat.com> - 2013.2-8.2
- Added puppet-neutron-vlan_ranges.patch (rhbz#1066549)
diff --git a/openstack.patch b/openstack.patch
new file mode 100644
index 0000000..5d50bdb
--- /dev/null
+++ b/openstack.patch
@@ -0,0 +1,48 @@
+diff --git a/manifests/all.pp b/manifests/all.pp
+index 8ce58b1..acbe1cb 100644
+--- a/manifests/all.pp
++++ b/manifests/all.pp
+@@ -133,7 +133,7 @@ class openstack::all (
+ $mysql_account_security = true,
+ $mysql_bind_address = '0.0.0.0',
+ $allowed_hosts = '%',
+- $charset = 'latin1',
++ $charset = 'utf8',
+ # Keystone
+ $keystone_host = '127.0.0.1',
+ $keystone_db_user = 'keystone',
+diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
+index 7a65607..4f212f7 100644
+--- a/manifests/db/mysql.pp
++++ b/manifests/db/mysql.pp
+@@ -35,7 +35,7 @@
+ # [ceilometer_db_user]. Name of ceilometer DB user. Optional. Defaults to 'ceilometer'.
+ # [ceilometer_db_dbname]. Name of ceilometer DB. Optional. Defaults to 'ceilometer'.
+ # [allowed_hosts] List of hosts that are allowed access. Optional. Defaults to false.
+-# [charset] Name of mysql charset. Optional. Defaults to 'latin1'.
++# [charset] Name of mysql charset. Optional. Defaults to 'utf8'.
+ # [enabled] If the db service should be started. Optional. Defaults to true.
+ #
+ # === Example
+@@ -94,7 +94,7 @@ class openstack::db::mysql (
+ $ceilometer_db_dbname = 'ceilometer',
+ # General
+ $allowed_hosts = false,
+- $charset = 'latin1',
++ $charset = 'utf8',
+ $enabled = true
+ ) {
+
+diff --git a/spec/classes/openstack_all_spec.rb b/spec/classes/openstack_all_spec.rb
+index 3890546..0b206e3 100644
+--- a/spec/classes/openstack_all_spec.rb
++++ b/spec/classes/openstack_all_spec.rb
+@@ -295,7 +295,7 @@ describe 'openstack::all' do
+
+ it 'should have openstack::db::mysql configured' do
+ should contain_class('openstack::db::mysql').with(
+- :charset => 'latin1',
++ :charset => 'utf8',
+ :mysql_root_password => 'sql_pass',
+ :mysql_bind_address => '0.0.0.0',
+ :mysql_account_security => true,
More information about the scm-commits
mailing list