From fcbb75ceae5514ebfa1b925347c028942b710caa Mon Sep 17 00:00:00 2001
From: yong sheng gong <gong.yongsheng@99cloud.net>
Date: Thu, 28 Sep 2017 16:18:43 +0000
Subject: [PATCH] fix wrong keystone_authtoken settings

Change-Id: Idfc0b4c6f4f5c699cd999662a98862ccc5286a5f
Closes-bug: 1720179
---
 ansible/roles/octavia/templates/octavia.conf.j2 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ansible/roles/octavia/templates/octavia.conf.j2 b/ansible/roles/octavia/templates/octavia.conf.j2
index e18fccd1b6..7d05650696 100644
--- a/ansible/roles/octavia/templates/octavia.conf.j2
+++ b/ansible/roles/octavia/templates/octavia.conf.j2
@@ -37,14 +37,14 @@ memcache_secret_key = {{ memcache_secret_key }}
 memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
 
 [keystone_authtoken]
-auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
-auth_host = {{ kolla_internal_fqdn }}
-auth_port = {{ keystone_public_port }}
-auth_protocol = {{ internal_protocol }}
+auth_uri = {{ keystone_internal_url }}
+auth_url = {{ keystone_admin_url }}
 auth_type = password
-admin_tenant_name = service
-admin_user = {{ octavia_keystone_user }}
-admin_password = {{ octavia_keystone_password }}
+project_domain_id = {{ default_project_domain_id }}
+user_domain_id = {{ default_user_domain_id }}
+project_name = service
+username = {{ octavia_keystone_user }}
+password = {{ octavia_keystone_password }}
 
 memcache_security_strategy = ENCRYPT
 memcache_secret_key = {{ memcache_secret_key }}