Merge "Update mysql connection in doc"
This commit is contained in:
commit
2a40ecfbfb
|
@ -52,14 +52,14 @@ class { 'glance::api':
|
||||||
keystone_tenant => 'services',
|
keystone_tenant => 'services',
|
||||||
keystone_user => 'glance',
|
keystone_user => 'glance',
|
||||||
keystone_password => '12345',
|
keystone_password => '12345',
|
||||||
database_connection => 'mysql://glance:12345@127.0.0.1/glance',
|
database_connection => 'mysql+pymysql://glance:12345@127.0.0.1/glance',
|
||||||
}
|
}
|
||||||
|
|
||||||
class { 'glance::registry':
|
class { 'glance::registry':
|
||||||
keystone_tenant => 'services',
|
keystone_tenant => 'services',
|
||||||
keystone_user => 'glance',
|
keystone_user => 'glance',
|
||||||
keystone_password => '12345',
|
keystone_password => '12345',
|
||||||
database_connection => 'mysql://glance:12345@127.0.0.1/glance',
|
database_connection => 'mysql+pymysql://glance:12345@127.0.0.1/glance',
|
||||||
}
|
}
|
||||||
|
|
||||||
class { 'glance::backend::file': }
|
class { 'glance::backend::file': }
|
||||||
|
|
|
@ -43,7 +43,7 @@ describe 'glance::api::db' do
|
||||||
|
|
||||||
context 'with MySQL-python library as backend package' do
|
context 'with MySQL-python library as backend package' do
|
||||||
let :params do
|
let :params do
|
||||||
{ :database_connection => 'mysql://glance_api:glance@localhost/glance' }
|
{ :database_connection => 'mysql+pymysql://glance_api:glance@localhost/glance' }
|
||||||
end
|
end
|
||||||
|
|
||||||
it { is_expected.to contain_package('python-mysqldb').with(:ensure => 'present') }
|
it { is_expected.to contain_package('python-mysqldb').with(:ensure => 'present') }
|
||||||
|
|
|
@ -43,7 +43,7 @@ describe 'glance::registry::db' do
|
||||||
|
|
||||||
context 'with MySQL-python library as backend package' do
|
context 'with MySQL-python library as backend package' do
|
||||||
let :params do
|
let :params do
|
||||||
{ :database_connection => 'mysql://glance_registry:glance@localhost/glance' }
|
{ :database_connection => 'mysql+pymysql://glance_registry:glance@localhost/glance' }
|
||||||
end
|
end
|
||||||
|
|
||||||
it { is_expected.to contain_package('python-mysqldb').with(:ensure => 'present') }
|
it { is_expected.to contain_package('python-mysqldb').with(:ensure => 'present') }
|
||||||
|
|
Loading…
Reference in New Issue