Set mysql connect timeout in the undercloud
This sets the mysql connect timeout in the containerized undercloud case. It mirrors Ia3799cdaf171892431151e4f2f7d2095081b8242. Related-Bug: #1783995 Change-Id: I727a38eb537f83accadca9ee7f38bd7ace62500e
This commit is contained in:
parent
664da5f348
commit
25901f8c53
|
@ -52,6 +52,9 @@ parameters:
|
|||
type: boolean
|
||||
description: Flag to indicate undercloud upgrade process is being run.
|
||||
default: false
|
||||
MySQLServerOptions:
|
||||
type: json
|
||||
default: {}
|
||||
|
||||
conditions:
|
||||
|
||||
|
@ -79,10 +82,14 @@ outputs:
|
|||
- {get_attr: [MysqlPuppetBase, role_data, config_settings]}
|
||||
# Set PID file to what kolla mariadb bootstrap script expects
|
||||
- tripleo::profile::base::database::mysql::mysql_server_options:
|
||||
mysqld:
|
||||
pid-file: /var/lib/mysql/mariadb.pid
|
||||
mysqld_safe:
|
||||
pid-file: /var/lib/mysql/mariadb.pid
|
||||
yaql:
|
||||
expression: $.data.reduce($1.mergeWith($2), {})
|
||||
data:
|
||||
- {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]}
|
||||
# BEGIN DOCKER SETTINGS #
|
||||
puppet_config:
|
||||
|
|
|
@ -136,3 +136,6 @@ parameter_defaults:
|
|||
ContainerImagePrepareLogFile: ../install-undercloud.log
|
||||
HeatEngineOptVolumes:
|
||||
- /usr/lib/heat:/usr/lib/heat:ro
|
||||
MySQLServerOptions:
|
||||
mysqld:
|
||||
connect_timeout: 60
|
||||
|
|
Loading…
Reference in New Issue