aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-19 15:39:39 +0000
committerGerrit Code Review <review@openstack.org>2016-10-19 15:39:39 +0000
commitafdf71e9348b4494887ac6e85d0a0ffbe7903231 (patch)
tree0c29bab6714ae2c1a32fb7721acc61b906b45d47 /ansible
parent6b25205b3b612981fd9171c6d70a297bf9888f3d (diff)
parent5040ea568f7cc5480944cd76807239099a1df0be (diff)
downloadkolla-afdf71e9348b4494887ac6e85d0a0ffbe7903231.tar.gz
kolla-afdf71e9348b4494887ac6e85d0a0ffbe7903231.zip
Merge "Deprecate auth_plugin option in manila"
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/manila/templates/manila.conf.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/ansible/roles/manila/templates/manila.conf.j2 b/ansible/roles/manila/templates/manila.conf.j2
index 2c286558d..08f518e09 100644
--- a/ansible/roles/manila/templates/manila.conf.j2
+++ b/ansible/roles/manila/templates/manila.conf.j2
@@ -30,7 +30,7 @@ max_retries = -1
signing_dir = /var/cache/manila
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
-auth_plugin = password
+auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service