summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-05-03 13:22:20 -0700
committerSteven Dake <stdake@cisco.com>2015-05-06 05:33:55 -0700
commitea0f5c7efaaefbc7c7ccc0db29560b780358097d (patch)
tree8308cd37445041204adf09fdc45d51821740a08e /docs
parent61cc479e90d321f7eac71749ebe3fe96081c1e05 (diff)
downloadkolla-ea0f5c7efaaefbc7c7ccc0db29560b780358097d.tar.gz
kolla-ea0f5c7efaaefbc7c7ccc0db29560b780358097d.zip
Add heat-api-cfn
Add Heat-api-cfn for wait conditions Magnum needs wait conditions in order to operate properly. heat-api-cfn is where wait conditions connect. Change-Id: I56742dd96e4607dc0042d0cef4e18c922f9ed736 Implements: blueprint container-heat-api-cfn
Diffstat (limited to 'docs')
-rw-r--r--docs/integration-guide.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/integration-guide.md b/docs/integration-guide.md
index 869791e23..58165a06e 100644
--- a/docs/integration-guide.md
+++ b/docs/integration-guide.md
@@ -101,7 +101,8 @@ all containers. This allows a simple method of ensuring every type of node
HEAT_DB_PASSWORD=<kolla> - The heat db password
HEAT_KEYSTONE_PASSWORD=<heat> - The keystone password for the heat user
HEAT_API_SERVICE_HOST=<IP> - The IP Address where the Heat API service is hosted
- HEAT_API_CFN_SERVICE_HOST=<IP> - The IP Address where Heat will contact the heat-engine in search for meta data
+ HEAT_API_CFN_SERVICE_HOST=<IP> - The IP Address where Heat users will contact the heat-engine in search for meta data
+ HEAT_API_CFN_URL_HOST=<IP> - The IP Address where Heat virtual machines will contact the heat-engine to signal wait conditions
PUBLIC_INTERFACE=<eth1> - The nova public interface
PUBLIC_IP=<Host IP Address> - The IP Address of this host
RABBITMQ_PASS=<rabbit> - The rabbitmq password used to join AMQP