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 /docker | |
| 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 'docker')
| -rwxr-xr-x | docker/common/cinder-app/cinder-api/start.sh | 8 | ||||
| -rw-r--r-- | docker/common/cinder-app/cinder-base/config-cinder.sh | 3 |
2 files changed, 6 insertions, 5 deletions
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 |