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 /tools | |
| 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 'tools')
| -rwxr-xr-x | tools/genenv | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/genenv b/tools/genenv index 28a11fda1..ad26dc938 100755 --- a/tools/genenv +++ b/tools/genenv @@ -39,6 +39,9 @@ MY_DEV=$(ip route get $(ip route | awk '$1 == "default" {print $3}') | echo MY_IP=$MY_IP echo MY_DEV=$MY_DEV +# API versions +CINDER_API_VERSION=2 + # Admin user password ADMIN_USER_PASSWORD=steakfordinner @@ -54,7 +57,6 @@ MARIADB_ROOT_PASSWORD=kolla MARIADB_MAX_CONNECTIONS=151 PASSWORD=12345 - # Galera DB_CLUSTER_BIND_ADDRESS=0.0.0.0 DB_CLUSTER_INIT_DB=false @@ -240,6 +242,7 @@ export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:${KEYSTONE_PUBLIC_SER export OS_USERNAME=$ADMIN_TENANT_NAME export OS_PASSWORD=$ADMIN_USER_PASSWORD export OS_TENANT_NAME=$ADMIN_TENANT_NAME +export OS_VOLUME_API_VERSION=$CINDER_API_VERSION EOF cat > ./compose/openstack.env <<EOF @@ -386,6 +389,7 @@ CINDER_VOLUME_DRIVER=$CINDER_VOLUME_DRIVER CINDER_ENABLED_BACKEND=$CINDER_ENABLED_BACKEND CINDER_LOG_DIR=$CINDER_LOG_DIR CINDER_API_LOG_FILE=$CINDER_API_LOG_FILE +CINDER_API_VERSION=$CINDER_API_VERSION CINDER_VOLUME_LOG_FILE=$CINDER_VOLUME_LOG_FILE CINDER_BACKUP_LOG_FILE=$CINDER_BACKUP_LOG_FILE CINDER_SCHEDULER_LOG_FILE=$CINDER_SCHEDULER_LOG_FILE |