diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-13 16:55:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-13 16:55:26 +0000 |
| commit | 1a7c3e67a2047f0a7c789fe2471b5d65825fb9e1 (patch) | |
| tree | 4b7e888d5db85e069ba10a441c18f97f6b5da846 /docs | |
| parent | db860f148e251a5eb0a24538c90e3893fd46675d (diff) | |
| parent | 2f2bb366e0aa856803c0d21a7a541802d814d180 (diff) | |
| download | kolla-1a7c3e67a2047f0a7c789fe2471b5d65825fb9e1.tar.gz kolla-1a7c3e67a2047f0a7c789fe2471b5d65825fb9e1.zip | |
Merge "Adds neutron-server to neutron container-set"
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/integration-guide.md | 8 | ||||
| -rw-r--r-- | docs/minimal-environment-vars.md | 14 |
2 files changed, 22 insertions, 0 deletions
diff --git a/docs/integration-guide.md b/docs/integration-guide.md index 409c47207..38a9f6545 100644 --- a/docs/integration-guide.md +++ b/docs/integration-guide.md @@ -84,6 +84,14 @@ all containers. This allows a simple method of ensuring every type of node 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 + NEUTRON_DB_NAME=<neutron> - The name of the Neutron database + NEUTRON_DB_USER=<neutron> - The name used by Neutron to access the Neutron database + NEUTRON_DB_PASSWORD=<password> The password used by Neutron to access the Neutron database + NEUTRON_KEYSTONE_USER=<neutron> - The name used by Neutron to communicate with Keystone + NEUTRON_KEYSTONE_PASSWORD=<neutron> - The password used by Neutron to communicate with Keystone + NEUTRON_SERVER_SERVICE_HOST=<$HOST_IP> - The IP address/hostname used to commuicate with the Neutron API + NEUTRON_SHARED_SECRET=<sharedsecret> - The shared secret used between Neutron/Nova to secure metadata communication + NEUTRON_API_PASTE_CONFIG=</usr/share/neutron/api-paste.ini> - Location of Neutron's API paste config file 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 diff --git a/docs/minimal-environment-vars.md b/docs/minimal-environment-vars.md index 713507f79..710ea443a 100644 --- a/docs/minimal-environment-vars.md +++ b/docs/minimal-environment-vars.md @@ -231,3 +231,17 @@ In order for each service to function, there is a minimum set of required variab NOVA_EC2_NETWORK_SERVICE_HOST NOVA_EC2_SERVICE_HOST PUBLIC_IP + +# Neutron/Nova + + NEUTRON_SHARED_SECRET + +# Neutron Server + + NEUTRON_DB_NAME + NEUTRON_DB_USER + NEUTRON_DB_PASSWORD + NEUTRON_KEYSTONE_USER + NEUTRON_KEYSTONE_PASSWORD + NEUTRON_SERVER_SERVICE_HOST + NEUTRON_API_PASTE_CONFIG |