Use pymysql for database driver

PyMySQL is the new database driver when running MySQL.
This patch updates our manifests to run it, since our modules already
support it.

Change-Id: I758c5c3bc7295f57102098cbe0d2d0f3b0f2692e
Depends-On: I7604cca9e2d7bf0b93c820adec5f937f72b64fa8
This commit is contained in:
Emilien Macchi 2016-01-08 13:26:10 -05:00
parent f3bdf37186
commit 1bc3782155
9 changed files with 10 additions and 10 deletions

View File

@ -29,7 +29,7 @@ class openstack_integration::aodh {
verbose => true, verbose => true,
debug => true, debug => true,
rabbit_host => '127.0.0.1', rabbit_host => '127.0.0.1',
database_connection => 'mysql://aodh:aodh@127.0.0.1/aodh?charset=utf8', database_connection => 'mysql+pymysql://aodh:aodh@127.0.0.1/aodh?charset=utf8',
} }
class { '::aodh::db::mysql': class { '::aodh::db::mysql':
password => 'aodh', password => 'aodh',

View File

@ -26,7 +26,7 @@ class openstack_integration::ceilometer {
password => 'ceilometer', password => 'ceilometer',
} }
class { '::ceilometer::db': class { '::ceilometer::db':
database_connection => 'mysql://ceilometer:ceilometer@127.0.0.1/ceilometer?charset=utf8', database_connection => 'mysql+pymysql://ceilometer:ceilometer@127.0.0.1/ceilometer?charset=utf8',
} }
class { '::ceilometer::keystone::auth': class { '::ceilometer::keystone::auth':
password => 'a_big_secret', password => 'a_big_secret',

View File

@ -21,7 +21,7 @@ class openstack_integration::cinder {
password => 'a_big_secret', password => 'a_big_secret',
} }
class { '::cinder': class { '::cinder':
database_connection => 'mysql://cinder:cinder@127.0.0.1/cinder?charset=utf8', database_connection => 'mysql+pymysql://cinder:cinder@127.0.0.1/cinder?charset=utf8',
rabbit_host => '127.0.0.1', rabbit_host => '127.0.0.1',
rabbit_userid => 'cinder', rabbit_userid => 'cinder',
rabbit_password => 'an_even_bigger_secret', rabbit_password => 'an_even_bigger_secret',

View File

@ -26,14 +26,14 @@ class openstack_integration::glance {
class { '::glance::api': class { '::glance::api':
debug => true, debug => true,
verbose => true, verbose => true,
database_connection => 'mysql://glance:glance@127.0.0.1/glance?charset=utf8', database_connection => 'mysql+pymysql://glance:glance@127.0.0.1/glance?charset=utf8',
keystone_password => 'a_big_secret', keystone_password => 'a_big_secret',
workers => 2, workers => 2,
} }
class { '::glance::registry': class { '::glance::registry':
debug => true, debug => true,
verbose => true, verbose => true,
database_connection => 'mysql://glance:glance@127.0.0.1/glance?charset=utf8', database_connection => 'mysql+pymysql://glance:glance@127.0.0.1/glance?charset=utf8',
keystone_password => 'a_big_secret', keystone_password => 'a_big_secret',
workers => 2, workers => 2,
} }

View File

@ -18,7 +18,7 @@ class openstack_integration::heat {
rabbit_userid => 'heat', rabbit_userid => 'heat',
rabbit_password => 'an_even_bigger_secret', rabbit_password => 'an_even_bigger_secret',
rabbit_host => '127.0.0.1', rabbit_host => '127.0.0.1',
database_connection => 'mysql://heat:heat@127.0.0.1/heat?charset=utf8', database_connection => 'mysql+pymysql://heat:heat@127.0.0.1/heat?charset=utf8',
identity_uri => 'http://127.0.0.1:35357/', identity_uri => 'http://127.0.0.1:35357/',
keystone_password => 'a_big_secret', keystone_password => 'a_big_secret',
debug => true, debug => true,

View File

@ -32,7 +32,7 @@ class openstack_integration::neutron {
} }
class { '::neutron::client': } class { '::neutron::client': }
class { '::neutron::server': class { '::neutron::server':
database_connection => 'mysql://neutron:neutron@127.0.0.1/neutron?charset=utf8', database_connection => 'mysql+pymysql://neutron:neutron@127.0.0.1/neutron?charset=utf8',
auth_password => 'a_big_secret', auth_password => 'a_big_secret',
identity_uri => 'http://127.0.0.1:35357/', identity_uri => 'http://127.0.0.1:35357/',
sync_db => true, sync_db => true,

View File

@ -21,7 +21,7 @@ class openstack_integration::nova {
password => 'a_big_secret', password => 'a_big_secret',
} }
class { '::nova': class { '::nova':
database_connection => 'mysql://nova:nova@127.0.0.1/nova?charset=utf8', database_connection => 'mysql+pymysql://nova:nova@127.0.0.1/nova?charset=utf8',
rabbit_host => '127.0.0.1', rabbit_host => '127.0.0.1',
rabbit_userid => 'nova', rabbit_userid => 'nova',
rabbit_password => 'an_even_bigger_secret', rabbit_password => 'an_even_bigger_secret',

View File

@ -21,7 +21,7 @@ class openstack_integration::sahara {
password => 'a_big_secret', password => 'a_big_secret',
} }
class { '::sahara': class { '::sahara':
database_connection => 'mysql://sahara:sahara@127.0.0.1/sahara?charset=utf8', database_connection => 'mysql+pymysql://sahara:sahara@127.0.0.1/sahara?charset=utf8',
# two plugins because of hardcode in tempest: # two plugins because of hardcode in tempest:
# https://github.com/openstack/tempest/blob/master/tempest/config.py#L923 # https://github.com/openstack/tempest/blob/master/tempest/config.py#L923
plugins => ['vanilla', 'hdp'], plugins => ['vanilla', 'hdp'],

View File

@ -15,7 +15,7 @@ class openstack_integration::trove {
} }
class { '::trove': class { '::trove':
database_connection => 'mysql://trove:trove@127.0.0.1/trove?charset=utf8', database_connection => 'mysql+pymysql://trove:trove@127.0.0.1/trove?charset=utf8',
rabbit_userid => 'trove', rabbit_userid => 'trove',
rabbit_password => 'an_even_bigger_secret', rabbit_password => 'an_even_bigger_secret',
rabbit_host => '127.0.0.1', rabbit_host => '127.0.0.1',