summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2016-02-03 08:43:09 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-02-03 08:43:09 +0000
commit1932dd452c10ee4800f4cf2658a6fe9db00a93ef (patch)
tree26dc2f23d28e87a6ac7424773c92d2494061662a
parentab99a7ee4e93b3a34f7a600461f7761a97b2c715 (diff)
parentbc0642e500d5f1fb983dde1ac5f928df7e8e3d78 (diff)
Merge "FIX:use v3 of auth_uri for cinder quota"
-rw-r--r--deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf2
-rw-r--r--deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf b/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf
index 8ecda649..66d9948a 100644
--- a/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf
+++ b/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf
@@ -52,7 +52,7 @@ volumes_dir=/var/lib/cinder/volumes
volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver
[keystone_authtoken]
-auth_uri = http://{{ internal_vip.ip }}:5000/v2.0
+auth_uri = http://{{ internal_vip.ip }}:5000/v3
identity_uri = http://{{ internal_vip.ip }}:35357
admin_tenant_name = service
admin_user = cinder
diff --git a/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf b/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf
index 4d8e49ce..0660cba9 100644
--- a/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf
+++ b/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf
@@ -51,7 +51,7 @@ volumes_dir=/var/lib/cinder/volumes
volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver
[keystone_authtoken]
-auth_uri = http://{{ internal_vip.ip }}:5000/v2.0
+auth_uri = http://{{ internal_vip.ip }}:5000/v3
identity_uri = http://{{ internal_vip.ip }}:35357
admin_tenant_name = service
admin_user = cinder