diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-26 22:13:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-26 22:13:55 +0000 |
| commit | a48900bc1c13fcca782261a9b3015a3676791c53 (patch) | |
| tree | 6db9f5105cff3ecdd0f414a70c177dc31d14a509 /docs | |
| parent | 529e5785ca443ed1e6570656f58c23604bae6694 (diff) | |
| parent | 3935cbafa31c1eb6da396c678876b4b3a3141e2a (diff) | |
| download | kolla-a48900bc1c13fcca782261a9b3015a3676791c53.tar.gz kolla-a48900bc1c13fcca782261a9b3015a3676791c53.zip | |
Merge "Liberty requires Cinder to use the v2 API"
Diffstat (limited to 'docs')
| -rwxr-xr-x | docs/integration-guide.md | 1 | ||||
| -rw-r--r-- | docs/minimal-environment-vars.md | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/docs/integration-guide.md b/docs/integration-guide.md index 0e130c290..38eb900a7 100755 --- a/docs/integration-guide.md +++ b/docs/integration-guide.md @@ -178,6 +178,7 @@ all containers. This allows a simple method of ensuring every type of node CINDER_ENABLED_BACKEND=<lvm57> - A list of backend names to use 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 [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 2ce6556fd..657824861 100644 --- a/docs/minimal-environment-vars.md +++ b/docs/minimal-environment-vars.md @@ -68,10 +68,8 @@ In order for each service to function, there is a minimum set of required variab KEYSTONE_ADMIN_SERVICE_PORT CINDER_KEYSTONE_USER CINDER_KEYSTONE_PASSWORD - CINDER_API_LOG_FILE CINDER_API_SERVICE_LISTEN CINDER_API_SERVICE_PORT - CINDER_API_SERVICE_LISTEN # Cinder-backup @@ -100,7 +98,7 @@ In order for each service to function, there is a minimum set of required variab CINDER_KEYSTONE_USER PUBLIC_IP KEYSTONE_AUTH_PROTOCOL - CINDER_LOG_DIR + CINDER_API_VERSION # Cinder-scheduler @@ -109,7 +107,6 @@ In order for each service to function, there is a minimum set of required variab CINDER_DB_NAME CINDER_DB_USER CINDER_DB_PASSWORD - CINDER_SCHEDULER_LOG_FILE INIT_CINDER_DB # Cinder-volume @@ -122,7 +119,6 @@ In order for each service to function, there is a minimum set of required variab CINDER_VOLUME_BACKEND_NAME CINDER_VOLUME_DRIVER CINDER_ENABLED_BACKEND - CINDER_VOLUME_LOG_FILE CINDER_LVM_LO_VOLUME_SIZE CINDER_VOLUME_GROUP |