aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-26 20:24:58 +0000
committerGerrit Code Review <review@openstack.org>2015-06-26 20:24:58 +0000
commit344495d292237939eeb80cfb69b8cff284b1065a (patch)
treeb5c1c28365c59046e23099281ddb818a6d5376e3 /docs
parentb2aeebd62e6fbc9a91f286c16e7f159bbb0e1042 (diff)
parent1d9c5f914c77f4b8e6804ad7a1a40f9c8c40d34e (diff)
downloadkolla-344495d292237939eeb80cfb69b8cff284b1065a.tar.gz
kolla-344495d292237939eeb80cfb69b8cff284b1065a.zip
Merge "Add missing openstack.env vars and export to heat"
Diffstat (limited to 'docs')
-rwxr-xr-xdocs/integration-guide.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/integration-guide.md b/docs/integration-guide.md
index c2bfe3c61..47ce2ad54 100755
--- a/docs/integration-guide.md
+++ b/docs/integration-guide.md
@@ -70,11 +70,12 @@ all containers. This allows a simple method of ensuring every type of node
GLANCE_REGISTRY_SERVICE_HOST=<glance IP> Glance registry service host
KEYSTONE_ADMIN_PASSWORD=<password>
KEYSTONE_ADMIN_SERVICE_HOST=<IP> - IP Address of Keystone Host
- KEYSTONE_ADMIN_SERVICE_PORT=<5000> - Port where Keystone operates
+ KEYSTONE_ADMIN_SERVICE_PORT=<35357> - Port where Keystone admin endpoint operates.
KEYSTONE_ADMIN_TOKEN=<keystone-secret> - A token used to access Keystone
KEYSTONE_AUTH_PROTOCOL=<http> - The keystone authentication protocol
KEYSTONE_DB_PASSWORD=<password> - The password used to access Keystone in the DB
KEYSTONE_PUBLIC_SERVICE_HOST=<IP> - The IP address where Keystone is running
+ KEYSTONE_PUBLIC_SERVICE_PORT=<5000> - Port which keystone uses for public service.
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