diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-23 20:48:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-23 20:48:41 +0000 |
| commit | d9442590569fed8ae161025fdc873fbbc1b4c8f7 (patch) | |
| tree | 0e1a4edc25a51cb44ebcd4f0d27ebb63087167dd /docs | |
| parent | 3d37fd95d7866a4cc0d098ee980738c937c959f7 (diff) | |
| parent | 1aa0f7ce49b16c0f6f76336f623c1f042221363d (diff) | |
| download | kolla-d9442590569fed8ae161025fdc873fbbc1b4c8f7.tar.gz kolla-d9442590569fed8ae161025fdc873fbbc1b4c8f7.zip | |
Merge "Fixes bug where heat container was not getting heat meta data"
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/integration-guide.md | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/integration-guide.md b/docs/integration-guide.md index c8da26d8a..118728d9b 100644 --- a/docs/integration-guide.md +++ b/docs/integration-guide.md @@ -67,13 +67,14 @@ all containers. This allows a simple method of ensuring every type of node NOVA_DB_USER=<nova> - The name of the nova DB password NOVA_EC2_API_SERVICE_HOST=<IP> - The IP Address where the Nova EC2 API is hosted arn't these two the same? - NOVA_EC2_SERVICE_HOST=<IP> _ The IP Address wher ethe Nova EC2 service is hosted + NOVA_EC2_SERVICE_HOST=<IP> _ The IP Address where the Nova EC2 service is hosted NOVA_KEYSTONE_PASSWORD=<password> - The Nova keystone password NOVA_KEYSTONE_USER=<nova> - The Nova keystone username HEAT_DB_NAME=<heat> - The heat DB name 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 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 @@ -83,6 +84,8 @@ all containers. This allows a simple method of ensuring every type of node RABBIT_USERID=<rabbit> - The RabbitMQ user id on the host + + ## Launching a container set Pick out a simple container set and launch it as follows: |