stackforge/puppet-openstack-cloud
Code Issues Proposed changes

databases: ensure utf8 charset

Browse Source 
We need to be sure we run UTF8 databases for every projects, otherwise
migration scripts could fail.

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-05-19 14:38:34 +02:00
parent 514d90a1f3
commit 0b58a625a1
8 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/identity.pp
View File

@@ -411,7 +411,7 @@ class cloud::identity (
debug => $debug, debug => $debug,
idle_timeout => 60, idle_timeout => 60,
log_facility => $log_facility, log_facility => $log_facility,
sql_connection => "mysql://${encoded_user}:${encoded_password}@${keystone_db_host}/keystone", sql_connection => "mysql://${encoded_user}:${encoded_password}@${keystone_db_host}/keystone?charset=utf8",
token_provider => 'keystone.token.providers.uuid.Provider', token_provider => 'keystone.token.providers.uuid.Provider',
use_syslog => $use_syslog, use_syslog => $use_syslog,
verbose => $verbose, verbose => $verbose,

2
manifests/image/api.pp
View File

@@ -104,7 +104,7 @@ class cloud::image::api(
$encoded_glance_password = uriescape($glance_db_password) $encoded_glance_password = uriescape($glance_db_password)
class { 'glance::api': class { 'glance::api':
database_connection => "mysql://${encoded_glance_user}:${encoded_glance_password}@${glance_db_host}/glance", database_connection => "mysql://${encoded_glance_user}:${encoded_glance_password}@${glance_db_host}/glance?charset=utf8",
registry_host => $openstack_vip, registry_host => $openstack_vip,
registry_port => $ks_glance_registry_internal_port, registry_port => $ks_glance_registry_internal_port,
verbose => $verbose, verbose => $verbose,

2
manifests/image/registry.pp
View File

@@ -86,7 +86,7 @@ class cloud::image::registry(
$encoded_glance_password = uriescape($glance_db_password) $encoded_glance_password = uriescape($glance_db_password)
class { 'glance::registry': class { 'glance::registry':
database_connection => "mysql://${encoded_glance_user}:${encoded_glance_password}@${glance_db_host}/glance", database_connection => "mysql://${encoded_glance_user}:${encoded_glance_password}@${glance_db_host}/glance?charset=utf8",
verbose => $verbose, verbose => $verbose,
debug => $debug, debug => $debug,
auth_host => $ks_keystone_internal_host, auth_host => $ks_keystone_internal_host,

2
manifests/orchestration.pp
View File

@@ -129,7 +129,7 @@ class cloud::orchestration(
keystone_protocol => $ks_keystone_admin_proto, keystone_protocol => $ks_keystone_admin_proto,
keystone_password => $ks_heat_password, keystone_password => $ks_heat_password,
auth_uri => "${ks_keystone_internal_proto}://${ks_keystone_internal_host}:${ks_keystone_internal_port}/v2.0", auth_uri => "${ks_keystone_internal_proto}://${ks_keystone_internal_host}:${ks_keystone_internal_port}/v2.0",
sql_connection => "mysql://${encoded_user}:${encoded_password}@${heat_db_host}/heat", sql_connection => "mysql://${encoded_user}:${encoded_password}@${heat_db_host}/heat?charset=utf8",
rabbit_hosts => $rabbit_hosts, rabbit_hosts => $rabbit_hosts,
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,
rabbit_userid => 'heat', rabbit_userid => 'heat',

2
spec/classes/cloud_identity_spec.rb
View File

@@ -102,7 +102,7 @@ describe 'cloud::identity' do
:verbose => true, :verbose => true,
:idle_timeout => '60', :idle_timeout => '60',
:log_facility => 'LOG_LOCAL0', :log_facility => 'LOG_LOCAL0',
:sql_connection => 'mysql://keystone:secrete@10.0.0.1/keystone', :sql_connection => 'mysql://keystone:secrete@10.0.0.1/keystone?charset=utf8',
:token_driver => 'keystone.token.backends.sql.Token', :token_driver => 'keystone.token.backends.sql.Token',
:token_provider => 'keystone.token.providers.uuid.Provider', :token_provider => 'keystone.token.providers.uuid.Provider',
:use_syslog => true, :use_syslog => true,

4
spec/classes/cloud_image_spec.rb
View File

@@ -45,7 +45,7 @@ describe 'cloud::image' do
it 'configure glance-api' do it 'configure glance-api' do
should contain_class('glance::api').with( should contain_class('glance::api').with(
:database_connection => 'mysql://glance:secrete@10.0.0.1/glance', :database_connection => 'mysql://glance:secrete@10.0.0.1/glance?charset=utf8',
:keystone_password => 'secrete', :keystone_password => 'secrete',
:registry_host => '10.0.0.42', :registry_host => '10.0.0.42',
:registry_port => '9191', :registry_port => '9191',
@@ -66,7 +66,7 @@ describe 'cloud::image' do
it 'configure glance-registry' do it 'configure glance-registry' do
should contain_class('glance::registry').with( should contain_class('glance::registry').with(
:database_connection => 'mysql://glance:secrete@10.0.0.1/glance', :database_connection => 'mysql://glance:secrete@10.0.0.1/glance?charset=utf8',
:keystone_password => 'secrete', :keystone_password => 'secrete',
:keystone_tenant => 'services', :keystone_tenant => 'services',
:keystone_user => 'glance', :keystone_user => 'glance',

2
spec/classes/cloud_orchestration_api_spec.rb
View File

@@ -65,7 +65,7 @@ describe 'cloud::orchestration::api' do
:keystone_protocol => 'http', :keystone_protocol => 'http',
:keystone_password => 'secrete', :keystone_password => 'secrete',
:auth_uri => 'http://10.0.0.1:5000/v2.0', :auth_uri => 'http://10.0.0.1:5000/v2.0',
:sql_connection => 'mysql://heat:secrete@10.0.0.1/heat', :sql_connection => 'mysql://heat:secrete@10.0.0.1/heat?charset=utf8',
:log_dir => false :log_dir => false
) )
end end

2
spec/classes/cloud_orchestration_engine_spec.rb
View File

@@ -68,7 +68,7 @@ describe 'cloud::orchestration::engine' do
:keystone_protocol => 'http', :keystone_protocol => 'http',
:keystone_password => 'secrete', :keystone_password => 'secrete',
:auth_uri => 'http://10.0.0.1:5000/v2.0', :auth_uri => 'http://10.0.0.1:5000/v2.0',
:sql_connection => 'mysql://heat:secrete@10.0.0.1/heat', :sql_connection => 'mysql://heat:secrete@10.0.0.1/heat?charset=utf8',
:log_dir => false :log_dir => false
) )
end end