summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2015-12-26 02:52:42 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-26 02:52:42 +0000
commita8624432701c9f1608a464c06f3b894d6fab76f9 (patch)
tree39ace54c48ff257bc6c70a729edb31cdc8b9e33c
parent4e9fd679144032ead4a5adb77f2f3a1d84de46b2 (diff)
parent60f460b7ed00bceb25c0f933c4e86205032d131e (diff)
Merge "bugfix: cinder keymgr should use v3 auth interface"
-rw-r--r--deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf b/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf
index b61e6562..3714aa50 100644
--- a/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf
+++ b/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf
@@ -62,3 +62,6 @@ admin_password = {{ CINDER_PASS }}
[database]
connection = mysql://cinder:{{ CINDER_DBPASS }}@{{ db_host }}/cinder
idle_timeout = 30
+
+[keymgr]
+encryption_auth_url=http://{{ internal_vip.ip }}:5000/v3