From 8ce76a068bab552752549d1ec2a7f55ab6a97762 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 21 Feb 2014 12:05:24 +0100 Subject: [PATCH] neutron: update mysql param to upstream Update belong http://git.io/gu1mtQ patch. Signed-off-by: Emilien Macchi --- manifests/network/controller.pp | 13 +++++-------- spec/classes/cloud_network_controller_spec.rb | 11 +++++------ 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp index b249df17..a8122657 100644 --- a/manifests/network/controller.pp +++ b/manifests/network/controller.pp @@ -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): diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb index 26c5cb06..9e655d01 100644 --- a/spec/classes/cloud_network_controller_spec.rb +++ b/spec/classes/cloud_network_controller_spec.rb @@ -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