aboutsummaryrefslogtreecommitdiff
path: root/docs
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 /docs
parent893ddcc73d6a73402989ce94ef8f3701ea6bc6f6 (diff)
parent4a4cf92eb9c00f54b6e9f916070fe82454ae86c2 (diff)
downloadkolla-0525afce5c540989e955997af94356c8e7bda988.tar.gz
kolla-0525afce5c540989e955997af94356c8e7bda988.zip
Merge "Fixes MariaDB to support Heat"
Diffstat (limited to 'docs')
-rwxr-xr-xdocs/integration-guide.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/integration-guide.md b/docs/integration-guide.md
index 884d74f22..0deb75dda 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