From 3935cbafa31c1eb6da396c678876b4b3a3141e2a Mon Sep 17 00:00:00 2001
From: Ryan Hallisey <rhallise@redhat.com>
Date: Fri, 26 Jun 2015 09:38:05 -0400
Subject: 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
---
 docker/common/cinder-app/cinder-api/start.sh          | 8 ++++----
 docker/common/cinder-app/cinder-base/config-cinder.sh | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'docker/common')

diff --git a/docker/common/cinder-app/cinder-api/start.sh b/docker/common/cinder-app/cinder-api/start.sh
index 860308e62..cbf0159e5 100755
--- a/docker/common/cinder-app/cinder-api/start.sh
+++ b/docker/common/cinder-app/cinder-api/start.sh
@@ -30,9 +30,9 @@ crux user-create --update \
 crux endpoint-create --remove-all \
     -n cinder \
     -t volume \
-    -P "http://${CINDER_API_SERVICE_HOST}:${CINDER_API_SERVICE_PORT}/v1/\$(tenant_id)s" \
-    -A "http://${CINDER_API_SERVICE_HOST}:${CINDER_API_SERVICE_PORT}/v1/\$(tenant_id)s" \
-    -I "http://${CINDER_API_SERVICE_HOST}:${CINDER_API_SERVICE_PORT}/v1/\$(tenant_id)s"
+    -P "http://${CINDER_API_SERVICE_HOST}:${CINDER_API_SERVICE_PORT}/v2/\$(tenant_id)s" \
+    -A "http://${CINDER_API_SERVICE_HOST}:${CINDER_API_SERVICE_PORT}/v2/\$(tenant_id)s" \
+    -I "http://${CINDER_API_SERVICE_HOST}:${CINDER_API_SERVICE_PORT}/v2/\$(tenant_id)s"
 
 crux endpoint-create --remove-all \
     -n cinderv2 \
@@ -61,7 +61,7 @@ crudini --set $cfg \
 crudini --set $cfg \
         DEFAULT \
         enable_v1_api \
-        "true"
+        "false"
 
 crudini --set $cfg \
         DEFAULT \
diff --git a/docker/common/cinder-app/cinder-base/config-cinder.sh b/docker/common/cinder-app/cinder-base/config-cinder.sh
index 37a5f2a4b..62deafb9e 100644
--- a/docker/common/cinder-app/cinder-base/config-cinder.sh
+++ b/docker/common/cinder-app/cinder-base/config-cinder.sh
@@ -11,7 +11,7 @@ check_required_vars CINDER_DB_PASSWORD CINDER_KEYSTONE_PASSWORD \
                     RABBIT_USERID RABBIT_PASSWORD GLANCE_API_SERVICE_HOST \
                     GLANCE_API_SERVICE_PORT ADMIN_TENANT_NAME \
                     CINDER_DB_NAME CINDER_DB_USER CINDER_KEYSTONE_USER \
-                    PUBLIC_IP KEYSTONE_AUTH_PROTOCOL
+                    PUBLIC_IP KEYSTONE_AUTH_PROTOCOL CINDER_API_VERSION
 
 dump_vars
 
@@ -20,6 +20,7 @@ export OS_AUTH_URL="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_SERVICE_HOST}:
 export OS_USERNAME="${CINDER_KEYSTONE_USER}"
 export OS_PASSWORD="${CINDER_KEYSTONE_PASSWORD}"
 export OS_TENANT_NAME="${ADMIN_TENANT_NAME}"
+export OS_VOLUME_API_VERSION=$CINDER_API_VERSION
 EOF
 
 cfg=/etc/cinder/cinder.conf
-- 
cgit v1.2.3