stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #153 from enovance/bug/152/emilien

Browse Source 
network/mysql: Fix configuration
This commit is contained in:
Gonéri Le Bouder
2014-02-04 05:22:17 -08:00
parent 7baf10b413 1b73886e10
commit c75214e7f0
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/network/controller.pp
View File

@@ -38,7 +38,10 @@ class cloud::network::controller(
auth_password => $ks_neutron_password, auth_password => $ks_neutron_password,
auth_host => $ks_keystone_admin_host, auth_host => $ks_keystone_admin_host,
auth_port => $ks_keystone_public_port, auth_port => $ks_keystone_public_port,
# TODO(EmilienM) This one should work, but it's the case now. Don't drop it.
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
} }

11
spec/classes/cloud_network_controller_spec.rb
View File

@@ -72,11 +72,12 @@ describe 'cloud::network::controller' do
it 'configure neutron server' do it 'configure neutron server' do
should contain_class('neutron::server').with( should contain_class('neutron::server').with(
:auth_password => 'secrete', :auth_password => 'secrete',
: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',
:api_workers => '2' :sql_connection => 'mysql://neutron:secrete@10.0.0.1/neutron?charset=utf8',
:api_workers => '2'
) )
end end
end end