aboutsummaryrefslogtreecommitdiff
path: root/docker/common
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-24 21:49:34 +0000
committerGerrit Code Review <review@openstack.org>2015-06-24 21:49:34 +0000
commit0525afce5c540989e955997af94356c8e7bda988 (patch)
tree46243a0b998f2cfe95a8f2151e505bbba27bd85a /docker/common
parent893ddcc73d6a73402989ce94ef8f3701ea6bc6f6 (diff)
parent4a4cf92eb9c00f54b6e9f916070fe82454ae86c2 (diff)
downloadkolla-0525afce5c540989e955997af94356c8e7bda988.tar.gz
kolla-0525afce5c540989e955997af94356c8e7bda988.zip
Merge "Fixes MariaDB to support Heat"
Diffstat (limited to 'docker/common')
-rwxr-xr-xdocker/common/mariadb-app/config-mysql.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/common/mariadb-app/config-mysql.sh b/docker/common/mariadb-app/config-mysql.sh
index b11939b8b..6cc6afa78 100755
--- a/docker/common/mariadb-app/config-mysql.sh
+++ b/docker/common/mariadb-app/config-mysql.sh
@@ -19,6 +19,7 @@ crudini --set $server_cnf mysqld default-storage-engine $DEFAULT_STORAGE_ENGINE
crudini --set $server_cnf mysqld collation-server $COLLATION_SERVER
crudini --set $server_cnf mysqld init-connect "'${INIT_CONNECT}'"
crudini --set $server_cnf mysqld character-set-server $CHAR_SET_SERVER
+crudini --set $server_cnf mysqld max_connections "$MARIADB_MAX_CONNECTIONS"
if [ "${INNODB_FILE_PER_TABLE}" == "true" ] || ["${INNODB_FILE_PER_TABLE}" == "True" ] ; then
crudini --set $server_cnf mysqld innodb_file_per_table 1
fi