openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use pymysql database driver for OpenStack DBs"

This commit is contained in:
Jenkins 2016-01-13 20:53:03 +00:00 committed by Gerrit Code Review
parent c662d0f7cc b8c2213f06
commit bdfdce52ad
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/cinder-storage.yaml
View File

@ -243,7 +243,7 @@ resources:
config: {get_resource: BlockStorageConfig} config: {get_resource: BlockStorageConfig}
input_values: input_values:
debug: {get_param: Debug} 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_name: {get_param: SnmpdReadonlyUserName}
snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword} snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
cinder_lvm_loop_device_size: cinder_lvm_loop_device_size:

14
puppet/controller.yaml
View File

@ -918,7 +918,7 @@ resources:
cinder_dsn: cinder_dsn:
list_join: list_join:
- '' - ''
- - 'mysql://cinder:' - - 'mysql+pymysql://cinder:'
- {get_param: CinderPassword} - {get_param: CinderPassword}
- '@' - '@'
- {get_param: MysqlVirtualIP} - {get_param: MysqlVirtualIP}
@ -935,7 +935,7 @@ resources:
glance_dsn: glance_dsn:
list_join: list_join:
- '' - ''
- - 'mysql://glance:' - - 'mysql+pymysql://glance:'
- {get_param: GlancePassword} - {get_param: GlancePassword}
- '@' - '@'
- {get_param: MysqlVirtualIP} - {get_param: MysqlVirtualIP}
@ -945,7 +945,7 @@ resources:
heat_dsn: heat_dsn:
list_join: list_join:
- '' - ''
- - 'mysql://heat:' - - 'mysql+pymysql://heat:'
- {get_param: HeatPassword} - {get_param: HeatPassword}
- '@' - '@'
- {get_param: MysqlVirtualIP} - {get_param: MysqlVirtualIP}
@ -961,7 +961,7 @@ resources:
keystone_dsn: keystone_dsn:
list_join: list_join:
- '' - ''
- - 'mysql://keystone:' - - 'mysql+pymysql://keystone:'
- {get_param: AdminToken} - {get_param: AdminToken}
- '@' - '@'
- {get_param: MysqlVirtualIP} - {get_param: MysqlVirtualIP}
@ -1067,7 +1067,7 @@ resources:
neutron_dsn: neutron_dsn:
list_join: list_join:
- '' - ''
- - 'mysql://neutron:' - - 'mysql+pymysql://neutron:'
- {get_param: NeutronPassword} - {get_param: NeutronPassword}
- '@' - '@'
- {get_param: MysqlVirtualIP} - {get_param: MysqlVirtualIP}
@ -1089,7 +1089,7 @@ resources:
ceilometer_dsn: ceilometer_dsn:
list_join: list_join:
- '' - ''
- - 'mysql://ceilometer:' - - 'mysql+pymysql://ceilometer:'
- {get_param: CeilometerPassword} - {get_param: CeilometerPassword}
- '@' - '@'
- {get_param: MysqlVirtualIP} - {get_param: MysqlVirtualIP}
@ -1101,7 +1101,7 @@ resources:
nova_dsn: nova_dsn:
list_join: list_join:
- '' - ''
- - 'mysql://nova:' - - 'mysql+pymysql://nova:'
- {get_param: NovaPassword} - {get_param: NovaPassword}
- '@' - '@'
- {get_param: MysqlVirtualIP} - {get_param: MysqlVirtualIP}