aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2016-02-03 09:22:38 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-02-03 09:22:38 +0000
commitb8b15a435e82fde83b5fb7ce1e6433f1d7662518 (patch)
treefa5837a391f3bd71cb5dd8e84f3fb71db2efaae1
parent277a170c7c7b73b599925f7b718a1a5fdd5f998e (diff)
parent1ee42175c82e36ee0851399b0f5727871a17f0f0 (diff)
Merge "FIX:use v3 of auth_uri for cinder quota" into stable/brahmaputra
-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 8ecda64..66d9948 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 4d8e49c..0660cba 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