Get internal endpoint type by default
- prefer internal endpoint by default for service requests
- set auth type to password explicitly
Change-Id: I9a299c7330567bff8a690f3cb6aea59d1cd97491
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
diff --git a/oslo_templates/files/queens/keystoneauth/_type_password.conf b/oslo_templates/files/queens/keystoneauth/_type_password.conf
index 3ba5e10..4920907 100644
--- a/oslo_templates/files/queens/keystoneauth/_type_password.conf
+++ b/oslo_templates/files/queens/keystoneauth/_type_password.conf
@@ -14,9 +14,7 @@
# admin - <No description provided>
# internal - <No description provided>
#endpoint_type = public
-{%- if _data.endpoint_type is defined %}
-endpoint_type = {{ _data.endpoint_type }}
-{%- endif %}
+endpoint_type = {{ _data.get('endpoint_type', 'internal') }}
# API version of the admin Identity API endpoint. (string value)
#auth_version = <None>
@@ -32,9 +30,7 @@
# Authentication type to load (string value)
# Deprecated group/name - [nova]/auth_plugin
#auth_type = <None>
-{%- if _data.get('auth_type', 'password') %}
-auth_type = {{ _data.get('auth_type', 'password') }}
-{%- endif %}
+auth_type = password
# Required if identity server requires client certificate (string value)
#certfile = <None>