aboutsummaryrefslogtreecommitdiff
path: root/docs/integration-guide.md
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-11 19:22:00 +0000
committerGerrit Code Review <review@openstack.org>2015-05-11 19:22:00 +0000
commit91b283ad10e449417dbbb436c2069ab77d08fc80 (patch)
treeb0db7129a8f487d46784ea13b457db070764d3bc /docs/integration-guide.md
parent861ece743ec9a070e49de19914169a4a67e8e47d (diff)
parent5a06901664cd8d3bb326d9e731e7dd82eec54f35 (diff)
downloadkolla-91b283ad10e449417dbbb436c2069ab77d08fc80.tar.gz
kolla-91b283ad10e449417dbbb436c2069ab77d08fc80.zip
Merge "Add Magnum Containers as a Service to Kolla"
Diffstat (limited to 'docs/integration-guide.md')
-rw-r--r--docs/integration-guide.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/integration-guide.md b/docs/integration-guide.md
index 58165a06e..1db81ab7b 100644
--- a/docs/integration-guide.md
+++ b/docs/integration-guide.md
@@ -110,6 +110,12 @@ all containers. This allows a simple method of ensuring every type of node
RABBITMQ_USER=<rabbit> - The RabbitMQ user name
RABBIT_PASSWORD=<password> - The RabbitMQ password
RABBIT_USERID=<rabbit> - The RabbitMQ user id on the host
+ MAGNUM_DB_NAME=<magnum> - The Magnum database name
+ MAGNUM_DB_PASSWORD=<kolla> - The Magnum database password
+ MAGNUM_KEYSTONE_PASSWORD=<magnum> - The Magnum keystone password
+ MAGNUM_API_SERVICE_HOST=<IP> - The Magnum Host IP address
+ MAGNUM_API_SERVICE_PORT=<9511> - The Magnum port
+
[Minimum environment variable setup guide.](https://github.com/stackforge/kolla/blob/master/docs/minimal-environment-vars.md)