From c376d9613fd1da40c05a1e4e9bb5edbdd127dd4c Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 4 Feb 2014 14:13:54 +0100 Subject: [PATCH 1/2] network/mysql: Fix configuration Close bug #152 Signed-off-by: Emilien Macchi --- manifests/network/controller.pp | 2 ++ spec/classes/cloud_network_controller_spec.rb | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp index 2e75c15e..2cfcc26c 100644 --- a/manifests/network/controller.pp +++ b/manifests/network/controller.pp @@ -39,6 +39,8 @@ class cloud::network::controller( auth_host => $ks_keystone_admin_host, auth_port => $ks_keystone_public_port, 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 } diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb index 024448f8..71322b2a 100644 --- a/spec/classes/cloud_network_controller_spec.rb +++ b/spec/classes/cloud_network_controller_spec.rb @@ -72,11 +72,12 @@ 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', - :api_workers => '2' + :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' ) end end From 1b73886e106b622f9e899b535d6a98d62c447441 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 4 Feb 2014 14:18:47 +0100 Subject: [PATCH 2/2] network/controller: add more comment for mysql param Signed-off-by: Emilien Macchi --- manifests/network/controller.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp index 2cfcc26c..ffdc60b8 100644 --- a/manifests/network/controller.pp +++ b/manifests/network/controller.pp @@ -38,6 +38,7 @@ class cloud::network::controller( 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",