From 4fe4820b1fd46b37d9fecae72fdcedc630c9382e Mon Sep 17 00:00:00 2001 From: "wu.chunyang" Date: Fri, 9 Oct 2020 17:26:37 +0800 Subject: [PATCH] remove redundant line and replace octavia user remove redundant space line replace octavia user with {{ octavia_keystone_user }} Change-Id: I284acc580a1a530eede3e0227febe8667dea5d47 --- ansible/roles/octavia/templates/octavia-openrc.sh.j2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ansible/roles/octavia/templates/octavia-openrc.sh.j2 b/ansible/roles/octavia/templates/octavia-openrc.sh.j2 index b0308c3c24..605613526b 100644 --- a/ansible/roles/octavia/templates/octavia-openrc.sh.j2 +++ b/ansible/roles/octavia/templates/octavia-openrc.sh.j2 @@ -3,9 +3,8 @@ for key in $( set | awk '{FS="="} /^OS_/ {print $1}' ); do unset $key ; done export OS_PROJECT_DOMAIN_NAME=Default export OS_USER_DOMAIN_NAME=Default export OS_PROJECT_NAME={{ octavia_service_auth_project }} -export OS_USERNAME=octavia +export OS_USERNAME={{ octavia_keystone_user }} export OS_PASSWORD={{ octavia_keystone_password }} export OS_AUTH_URL={{ keystone_admin_url }}/v3 export OS_INTERFACE=internal export OS_ENDPOINT_TYPE=internalURL -