diff --git a/docker/common/mariadb-app/config-mysql.sh b/docker/common/mariadb-app/config-mysql.sh
index b11939b8bbaccf0d040b18d4ef9b3af21dfa582a..6cc6afa7828fc71d13e8e47922efb0659877961f 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
diff --git a/docs/integration-guide.md b/docs/integration-guide.md
index 884d74f22ad722c0c3874a3c922f18da61317b3d..0deb75dda1eb42b756100b7acf71ff6fb200d850 100755
--- a/docs/integration-guide.md
+++ b/docs/integration-guide.md
@@ -77,6 +77,7 @@ all containers.  This allows a simple method of ensuring every type of node
     KEYSTONE_PUBLIC_SERVICE_HOST=<IP> - The IP address where Keystone is running
     MARIADB_ROOT_PASSWORD=<mariadb root password> - defines the MariaDB root password
     MARIADB_SERVICE_HOST=<IP> - The IP Address where Mariadb is running
+    MARIADB_MAX_CONNECTIONS=<151> - The maximum number of connections to the MariaDB server
     NETWORK_MANAGER=<nova|neutron> - Use Nova or Neutron networking
     NOVA_API_SERVICE_HOST=<IP> - The IP Address where the Nova API Service is hosted
     METADATA_HOST=<IP> - The IP address of the Nova Metadata service
diff --git a/tools/genenv b/tools/genenv
index fdb1920001eab453ee8f1d81adc636e8ea880c88..63b4189ae7f02a30dfe7f677b393e9c670994c65 100755
--- a/tools/genenv
+++ b/tools/genenv
@@ -31,6 +31,7 @@ INIT_HEAT_DB=true
 INIT_KEYSTONE_DB=true
 INIT_NOVA_DB=true
 MARIADB_ROOT_PASSWORD=kolla
+MARIADB_MAX_CONNECTIONS=151
 PASSWORD=12345
 
 
@@ -256,6 +257,7 @@ KEYSTONE_DB_PASSWORD=$KEYSTONE_DB_PASSWORD
 KEYSTONE_PUBLIC_SERVICE_HOST=$KEYSTONE_PUBLIC_SERVICE_HOST
 MARIADB_SERVICE_HOST=$HOST_IP
 MARIADB_ROOT_PASSWORD=$MARIADB_ROOT_PASSWORD
+MARIADB_MAX_CONNECTIONS=$MARIADB_MAX_CONNECTIONS
 NETWORK_MANAGER=$NETWORK_MANAGER
 NOVA_API_SERVICE_HOST=$NOVA_API_SERVICE_HOST
 NOVA_METADATA_API_SERVICE_HOST=$NOVA_METADATA_API_SERVICE_HOST