diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp index 2e75c15e..ffdc60b8 100644 --- a/manifests/network/controller.pp +++ b/manifests/network/controller.pp @@ -38,7 +38,10 @@ 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", 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