stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #287 from enovance/update-neutron-upstream

Browse Source 
neutron: update mysql param to upstream
This commit is contained in:
Sebastien Badia
2014-02-21 13:14:49 +01:00
parent 773c8180c6 8ce76a068b
commit 742a29031c
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/network/controller.pp
View File

@@ -35,14 +35,11 @@ class cloud::network::controller(
$encoded_password = uriescape($neutron_db_password)
class { 'neutron::server':
auth_password => $ks_neutron_password,
auth_host => $ks_keystone_admin_host,
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",
# TODO(EmilienM) Should be deprecated - bug GH#152
sql_connection => "mysql://${encoded_user}:${encoded_password}@${neutron_db_host}/neutron?charset=utf8",
api_workers => $::processorcount
auth_password => $ks_neutron_password,
auth_host => $ks_keystone_admin_host,
auth_port => $ks_keystone_public_port,
database_connection => "mysql://${encoded_user}:${encoded_password}@${neutron_db_host}/neutron?charset=utf8",
api_workers => $::processorcount
}
# Note(EmilienM):

11
spec/classes/cloud_network_controller_spec.rb
View File

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