diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-17 11:33:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-17 11:33:45 +0000 |
| commit | a5b6b2f0d7a7474280fee554599cd0a3b451e241 (patch) | |
| tree | 8b2bc836e6844a9b97fd52f72da79dc039634508 /docs | |
| parent | 2d765e4cb342922f1f09fec04c4b03a00574b8d3 (diff) | |
| parent | 08a1414738df061bc352c906c4859148394b09cb (diff) | |
| download | kolla-a5b6b2f0d7a7474280fee554599cd0a3b451e241.tar.gz kolla-a5b6b2f0d7a7474280fee554599cd0a3b451e241.zip | |
Merge "Parttially implement ceilometer container code"
Diffstat (limited to 'docs')
| -rwxr-xr-x | docs/integration-guide.md | 6 | ||||
| -rw-r--r-- | docs/minimal-environment-vars.md | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/docs/integration-guide.md b/docs/integration-guide.md index 38eb900a7..029f370b0 100755 --- a/docs/integration-guide.md +++ b/docs/integration-guide.md @@ -179,6 +179,12 @@ all containers. This allows a simple method of ensuring every type of node INIT_CINDER_DB=<true|false> - Initialize or update the cinder db KEEPALIVED_HOST_PRIORITIES=<host1:100,host2:99> - Map of priorities per node. Priorities have to be unique. CINDER_API_VERSION=<2> - The API version for Cinder + CEILOMETER_ADMIN_PASSWORD=<password> - The Ceilometer password + CEILOMETER_API_SERVICE_HOST=<IP> - The IP Address where Ceilometer listens + CEILOMETER_DB_NAME=<ceilometer> - Ceilometer DB name + CEILOMETER_DB_PASSWORD=<password> - Ceilometer DB password + CEILOMETER_DB_USER=<ceilometer> - Ceilometer DB User + CEILOMETER_KEYSTONE_USER=<ceilometer> - Ceilometer Keystone user [Minimum environment variable setup guide.](https://github.com/stackforge/kolla/blob/master/docs/minimal-environment-vars.md) diff --git a/docs/minimal-environment-vars.md b/docs/minimal-environment-vars.md index 29699d3f5..53c68af54 100644 --- a/docs/minimal-environment-vars.md +++ b/docs/minimal-environment-vars.md @@ -34,7 +34,6 @@ In order for each service to function, there is a minimum set of required variab KEYSTONE_ADMIN_SERVICE_PORT KEYSTONE_ADMIN_TOKEN KEYSTONE_PUBLIC_SERVICE_HOST - dump_vars # Ceilometer-central |