openstack/puppet-neutron
Code Issues Proposed changes

Merge "fix mysql connection"

Browse Source
This commit is contained in:
Zuul 2018-03-12 10:45:28 +00:00 committed by Gerrit Code Review
commit 8f6186f011
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -59,7 +59,7 @@ class { '::neutron':
# configure authentication
class { 'neutron::server':
auth_password => 'keystone_neutron_secret',
sql_connection => 'mysql://neutron:neutron_sql_secret@127.0.0.1/neutron?charset=utf8',
sql_connection => 'mysql+pymysql://neutron:neutron_sql_secret@127.0.0.1/neutron?charset=utf8',
}
# ml2 plugin with vxlan as ml2 driver and ovs as mechanism driver

2
examples/neutron.pp
View File

@ -13,7 +13,7 @@ class { '::neutron':
# The API server talks to keystone for authorisation
class { '::neutron::server':
auth_password => 'password',
database_connection => 'mysql://neutron:password@192.168.1.1/neutron',
database_connection => 'mysql+pymysql://neutron:password@192.168.1.1/neutron',
}
# Configure nova notifications system

2
examples/neutron_l3_with_to_uuid.pp
View File

@ -16,7 +16,7 @@ class { '::neutron':
class { '::neutron::server':
auth_password => 'password',
database_connection => 'mysql://neutron:password@192.168.1.1/neutron',
database_connection => 'mysql+pymysql://neutron:password@192.168.1.1/neutron',
}
# configure l3-agent to use the new router by name

2
examples/neutron_with_pacemaker.pp
View File

@ -31,7 +31,7 @@ class { '::neutron::server':
enabled => false,
manage_service => false,
keystone_password => 'password',
connection => 'mysql://neutron:password@192.168.1.1/neutron',
connection => 'mysql+pymysql://neutron:password@192.168.1.1/neutron',
}
class { '::neutron::agents::dhcp':

4
spec/classes/neutron_db_spec.rb
View File

@ -47,11 +47,11 @@ describe 'neutron::db' do
context 'with MySQL-python library as backend package' do
let :params do
{ :database_connection => 'mysql://neutron:neutron@localhost/neutron' }
{ :database_connection => 'mysql+pymysql://neutron:neutron@localhost/neutron' }
end
it { is_expected.to contain_oslo__db('neutron_config').with(
:connection => 'mysql://neutron:neutron@localhost/neutron',
:connection => 'mysql+pymysql://neutron:neutron@localhost/neutron',
)}
end