Merge "Set mysql connect timeout in the undercloud"
This commit is contained in:
commit
1badfc470a
|
@ -52,6 +52,9 @@ parameters:
|
||||||
type: boolean
|
type: boolean
|
||||||
description: Flag to indicate undercloud upgrade process is being run.
|
description: Flag to indicate undercloud upgrade process is being run.
|
||||||
default: false
|
default: false
|
||||||
|
MySQLServerOptions:
|
||||||
|
type: json
|
||||||
|
default: {}
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
|
|
||||||
|
@ -79,10 +82,14 @@ outputs:
|
||||||
- {get_attr: [MysqlPuppetBase, role_data, config_settings]}
|
- {get_attr: [MysqlPuppetBase, role_data, config_settings]}
|
||||||
# Set PID file to what kolla mariadb bootstrap script expects
|
# Set PID file to what kolla mariadb bootstrap script expects
|
||||||
- tripleo::profile::base::database::mysql::mysql_server_options:
|
- tripleo::profile::base::database::mysql::mysql_server_options:
|
||||||
mysqld:
|
yaql:
|
||||||
pid-file: /var/lib/mysql/mariadb.pid
|
expression: $.data.reduce($1.mergeWith($2), {})
|
||||||
mysqld_safe:
|
data:
|
||||||
pid-file: /var/lib/mysql/mariadb.pid
|
- {get_param: MySQLServerOptions}
|
||||||
|
- mysqld:
|
||||||
|
pid-file: /var/lib/mysql/mariadb.pid
|
||||||
|
mysqld_safe:
|
||||||
|
pid-file: /var/lib/mysql/mariadb.pid
|
||||||
logging_source: {get_attr: [MysqlPuppetBase, role_data, logging_source]}
|
logging_source: {get_attr: [MysqlPuppetBase, role_data, logging_source]}
|
||||||
# BEGIN DOCKER SETTINGS #
|
# BEGIN DOCKER SETTINGS #
|
||||||
puppet_config:
|
puppet_config:
|
||||||
|
|
|
@ -136,3 +136,6 @@ parameter_defaults:
|
||||||
ContainerImagePrepareLogFile: ../install-undercloud.log
|
ContainerImagePrepareLogFile: ../install-undercloud.log
|
||||||
HeatEngineOptVolumes:
|
HeatEngineOptVolumes:
|
||||||
- /usr/lib/heat:/usr/lib/heat:ro
|
- /usr/lib/heat:/usr/lib/heat:ro
|
||||||
|
MySQLServerOptions:
|
||||||
|
mysqld:
|
||||||
|
connect_timeout: 60
|
||||||
|
|
Loading…
Reference in New Issue