stackforge/puppet-openstack-cloud
Code Issues Proposed changes

network/mysql: Fix configuration

Browse Source 
Close bug #152

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-02-04 14:13:54 +01:00
parent 7baf10b413
commit c376d9613f
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/network/controller.pp
View File

@@ -39,6 +39,8 @@ class cloud::network::controller(
auth_host => $ks_keystone_admin_host, auth_host => $ks_keystone_admin_host,
auth_port => $ks_keystone_public_port, auth_port => $ks_keystone_public_port,
connection => "mysql://${encoded_user}:${encoded_password}@${neutron_db_host}/neutron?charset=utf8", connection => "mysql://${encoded_user}:${encoded_password}@${neutron_db_host}/neutron?charset=utf8",
# TODO(EmilienM) Should be deprecated - bug GH#152
sql_connection => "mysql://${encoded_user}:${encoded_password}@${neutron_db_host}/neutron?charset=utf8",
api_workers => $::processorcount api_workers => $::processorcount
} }

1
spec/classes/cloud_network_controller_spec.rb
View File

@@ -76,6 +76,7 @@ describe 'cloud::network::controller' do
:auth_host => '10.0.0.1', :auth_host => '10.0.0.1',
:auth_port => '5000', :auth_port => '5000',
:connection => 'mysql://neutron:secrete@10.0.0.1/neutron?charset=utf8', :connection => 'mysql://neutron:secrete@10.0.0.1/neutron?charset=utf8',
:sql_connection => 'mysql://neutron:secrete@10.0.0.1/neutron?charset=utf8',
:api_workers => '2' :api_workers => '2'
) )
end end