Merge "Set mysql connect timeout in the undercloud"

docker/services/database/mysql.yaml

@@ -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:

environments/undercloud.yaml

@@ -136,3 +136,6 @@ parameter_defaults:
   ContainerImagePrepareLogFile: ../install-undercloud.log
   HeatEngineOptVolumes:
     - /usr/lib/heat:/usr/lib/heat:ro
+  MySQLServerOptions:
+    mysqld:
+      connect_timeout: 60