Merge "Fix section keystone_authtoken of sahara.conf"

ansible/roles/sahara/templates/sahara.conf.j2

@@ -14,12 +14,13 @@ use_rootwrap = True
 connection = mysql+pymysql://{{ sahara_database_user }}:{{ sahara_database_password }}@{{ sahara_database_address }}/{{ sahara_database_name }}
 
 [keystone_authtoken]
-www_authenticate_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
 auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
 auth_type = password
-admin_user = {{ sahara_keystone_user }}
-admin_password = {{ sahara_keystone_password }}
-admin_tenant_name = service
+user_domain_name = {{ default_project_domain_name }}
+project_name = service
+project_domain_name = {{ default_project_domain_name }}
+username = {{ sahara_keystone_user }}
+password = {{ sahara_keystone_password }}
 
 memcache_security_strategy = ENCRYPT
 memcache_secret_key = {{ memcache_secret_key }}