aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-13 20:53:03 +0000
committerGerrit Code Review <review@openstack.org>2016-01-13 20:53:03 +0000
commitbdfdce52ad08d4ce70e7d4ca61b1c6d8409a8730 (patch)
treebe74049b9824c4663635c6c1858691857f087a56 /puppet
parentc662d0f7cc2286b038e0a04f12507322fd2ba78f (diff)
parentb8c2213f06d0c798d50285ca20fa0f6311985a64 (diff)
Merge "Use pymysql database driver for OpenStack DBs"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/cinder-storage.yaml2
-rw-r--r--puppet/controller.yaml14
2 files changed, 8 insertions, 8 deletions
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index 82aa3a03..fd9365bd 100644
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -243,7 +243,7 @@ resources:
config: {get_resource: BlockStorageConfig}
input_values:
debug: {get_param: Debug}
- cinder_dsn: {list_join: ['', ['mysql://cinder:', {get_param: CinderPassword}, '@', {get_param: MysqlVirtualIP} , '/cinder']]}
+ cinder_dsn: {list_join: ['', ['mysql+pymysql://cinder:', {get_param: CinderPassword}, '@', {get_param: MysqlVirtualIP} , '/cinder']]}
snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
cinder_lvm_loop_device_size:
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index fdb619cf..f5378221 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -918,7 +918,7 @@ resources:
cinder_dsn:
list_join:
- ''
- - - 'mysql://cinder:'
+ - - 'mysql+pymysql://cinder:'
- {get_param: CinderPassword}
- '@'
- {get_param: MysqlVirtualIP}
@@ -935,7 +935,7 @@ resources:
glance_dsn:
list_join:
- ''
- - - 'mysql://glance:'
+ - - 'mysql+pymysql://glance:'
- {get_param: GlancePassword}
- '@'
- {get_param: MysqlVirtualIP}
@@ -945,7 +945,7 @@ resources:
heat_dsn:
list_join:
- ''
- - - 'mysql://heat:'
+ - - 'mysql+pymysql://heat:'
- {get_param: HeatPassword}
- '@'
- {get_param: MysqlVirtualIP}
@@ -961,7 +961,7 @@ resources:
keystone_dsn:
list_join:
- ''
- - - 'mysql://keystone:'
+ - - 'mysql+pymysql://keystone:'
- {get_param: AdminToken}
- '@'
- {get_param: MysqlVirtualIP}
@@ -1067,7 +1067,7 @@ resources:
neutron_dsn:
list_join:
- ''
- - - 'mysql://neutron:'
+ - - 'mysql+pymysql://neutron:'
- {get_param: NeutronPassword}
- '@'
- {get_param: MysqlVirtualIP}
@@ -1089,7 +1089,7 @@ resources:
ceilometer_dsn:
list_join:
- ''
- - - 'mysql://ceilometer:'
+ - - 'mysql+pymysql://ceilometer:'
- {get_param: CeilometerPassword}
- '@'
- {get_param: MysqlVirtualIP}
@@ -1101,7 +1101,7 @@ resources:
nova_dsn:
list_join:
- ''
- - - 'mysql://nova:'
+ - - 'mysql+pymysql://nova:'
- {get_param: NovaPassword}
- '@'
- {get_param: MysqlVirtualIP}