From 1bc3782155829637e7194bfcd30aa6d24757d5bd Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 8 Jan 2016 13:26:10 -0500 Subject: [PATCH] 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 --- manifests/aodh.pp | 2 +- manifests/ceilometer.pp | 2 +- manifests/cinder.pp | 2 +- manifests/glance.pp | 4 ++-- manifests/heat.pp | 2 +- manifests/neutron.pp | 2 +- manifests/nova.pp | 2 +- manifests/sahara.pp | 2 +- manifests/trove.pp | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifests/aodh.pp b/manifests/aodh.pp index cd1f7367b..34fbd049f 100644 --- a/manifests/aodh.pp +++ b/manifests/aodh.pp @@ -29,7 +29,7 @@ class openstack_integration::aodh { verbose => true, debug => true, 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': password => 'aodh', diff --git a/manifests/ceilometer.pp b/manifests/ceilometer.pp index 72a75a22d..ffa31dcb1 100644 --- a/manifests/ceilometer.pp +++ b/manifests/ceilometer.pp @@ -26,7 +26,7 @@ class openstack_integration::ceilometer { password => 'ceilometer', } 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': password => 'a_big_secret', diff --git a/manifests/cinder.pp b/manifests/cinder.pp index 4650ed780..f0ad47323 100644 --- a/manifests/cinder.pp +++ b/manifests/cinder.pp @@ -21,7 +21,7 @@ class openstack_integration::cinder { password => 'a_big_secret', } 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_userid => 'cinder', rabbit_password => 'an_even_bigger_secret', diff --git a/manifests/glance.pp b/manifests/glance.pp index 6a92bac78..7aa1212b7 100644 --- a/manifests/glance.pp +++ b/manifests/glance.pp @@ -26,14 +26,14 @@ class openstack_integration::glance { class { '::glance::api': debug => 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', workers => 2, } class { '::glance::registry': debug => 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', workers => 2, } diff --git a/manifests/heat.pp b/manifests/heat.pp index 5b333faab..c1f084b6a 100644 --- a/manifests/heat.pp +++ b/manifests/heat.pp @@ -18,7 +18,7 @@ class openstack_integration::heat { rabbit_userid => 'heat', rabbit_password => 'an_even_bigger_secret', 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/', keystone_password => 'a_big_secret', debug => true, diff --git a/manifests/neutron.pp b/manifests/neutron.pp index 2e1b8a8dc..2a5eee579 100644 --- a/manifests/neutron.pp +++ b/manifests/neutron.pp @@ -32,7 +32,7 @@ class openstack_integration::neutron { } class { '::neutron::client': } 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', identity_uri => 'http://127.0.0.1:35357/', sync_db => true, diff --git a/manifests/nova.pp b/manifests/nova.pp index 4f8953eab..e1fba9bf8 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -21,7 +21,7 @@ class openstack_integration::nova { password => 'a_big_secret', } 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_userid => 'nova', rabbit_password => 'an_even_bigger_secret', diff --git a/manifests/sahara.pp b/manifests/sahara.pp index b8b1c1e10..92998d5dd 100644 --- a/manifests/sahara.pp +++ b/manifests/sahara.pp @@ -21,7 +21,7 @@ class openstack_integration::sahara { password => 'a_big_secret', } 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: # https://github.com/openstack/tempest/blob/master/tempest/config.py#L923 plugins => ['vanilla', 'hdp'], diff --git a/manifests/trove.pp b/manifests/trove.pp index 711361493..836d2dd6f 100644 --- a/manifests/trove.pp +++ b/manifests/trove.pp @@ -15,7 +15,7 @@ class openstack_integration::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_password => 'an_even_bigger_secret', rabbit_host => '127.0.0.1',