diff options
| author | Ryan Hallisey <rhallise@redhat.com> | 2015-06-26 09:38:05 -0400 |
|---|---|---|
| committer | Ryan Hallisey <rhallise@redhat.com> | 2015-06-26 17:17:34 -0400 |
| commit | 3935cbafa31c1eb6da396c678876b4b3a3141e2a (patch) | |
| tree | 79f045e0141cd57a09fdb13d26ccc262d30d39be /tools/genenv | |
| parent | 370343e329aee9e68fb6e2c0c872d60a72ac3832 (diff) | |
| download | kolla-3935cbafa31c1eb6da396c678876b4b3a3141e2a.tar.gz kolla-3935cbafa31c1eb6da396c678876b4b3a3141e2a.zip | |
Liberty requires Cinder to use the v2 API
The Liberty release of Cinder will remove the v1 api so we
need to disable it in the cinder_api container and use v2.
Change-Id: I5dab7214d4d39afdf92555e3ffbd7f4a6194cd45
Closes-bug: #1469177
Diffstat (limited to 'tools/genenv')
| -rwxr-xr-x | tools/genenv | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/genenv b/tools/genenv index 535d7356c..4cfbbf9c9 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 @@ -234,6 +236,7 @@ export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0" 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 @@ -377,6 +380,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 |