Mitaka keystone auth support
Change-Id: I68c1b22b97b4223c6ab4df4e9295d9b7fa44afd3
diff --git a/neutron/files/mitaka/neutron-server.conf.contrail.Debian b/neutron/files/mitaka/neutron-server.conf.contrail.Debian
index e6889e8..03ed0a4 100644
--- a/neutron/files/mitaka/neutron-server.conf.contrail.Debian
+++ b/neutron/files/mitaka/neutron-server.conf.contrail.Debian
@@ -779,17 +779,19 @@
[keystone_authtoken]
-
-identity_uri = http://{{ server.identity.host }}:5000
-auth_host = {{ server.identity.host }}
-auth_port = {{ server.identity.port }}
-auth_protocol = http
-admin_tenant_name = {{ server.identity.tenant }}
-admin_user = {{ server.identity.user }}
-admin_password = {{ server.identity.password }}
+auth_region={{ server.identity.region }}
+revocation_cache_time = 10
+auth_type = password
+user_domain_id = {{ server.identity.get('domain', 'default') }}
+project_domain_id = {{ server.identity.get('domain', 'default') }}
+project_name = {{ server.identity.tenant }}
+username = {{ server.identity.user }}
+password = {{ server.identity.password }}
auth_uri=http://{{ server.identity.host }}:5000
auth_url=http://{{ server.identity.host }}:35357
-auth_region={{ server.identity.region }}
+{%- if server.cache is defined %}
+memcached_servers={%- for member in server.cache.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{%- endfor %}
+{%- endif %}
#
# From keystonemiddleware.auth_token
#