openstack/kolla-ansible
Code Issues Proposed changes

Improve admin-openrc

Browse Source 
add clear old environment
set openstack client to use internalURL
set manila client to use internalURL

Change-Id: I263fa11ff5439b28d63a6a9ce7ba460cb56fb8e2
This commit is contained in:
Xing Zhang 2019-09-04 14:36:54 +08:00
parent 92008433e5
commit f8c3dccd5c
No known key found for this signature in database
GPG Key ID: 43F80E57B910E3B0
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/common/templates/admin-openrc.sh.j2
View File

@ -1,3 +1,5 @@
# Clear any old environment that may conflict.
for key in $( set | awk '{FS="="} /^OS_/ {print $1}' ); do unset $key ; done
export OS_PROJECT_DOMAIN_NAME=Default export OS_PROJECT_DOMAIN_NAME=Default
export OS_USER_DOMAIN_NAME=Default export OS_USER_DOMAIN_NAME=Default
export OS_PROJECT_NAME={{ keystone_admin_project }} export OS_PROJECT_NAME={{ keystone_admin_project }}
@ -6,6 +8,10 @@ export OS_USERNAME={{ keystone_admin_user }}
export OS_PASSWORD={{ keystone_admin_password }} export OS_PASSWORD={{ keystone_admin_password }}
export OS_AUTH_URL={{ keystone_admin_url }}/v3 export OS_AUTH_URL={{ keystone_admin_url }}/v3
export OS_INTERFACE=internal export OS_INTERFACE=internal
export OS_ENDPOINT_TYPE=internalURL
{% if enable_manila | bool %}
export OS_MANILA_ENDPOINT_TYPE=internalURL
{% endif %}
export OS_IDENTITY_API_VERSION=3 export OS_IDENTITY_API_VERSION=3
export OS_REGION_NAME={{ openstack_region_name }} export OS_REGION_NAME={{ openstack_region_name }}
export OS_AUTH_PLUGIN=password export OS_AUTH_PLUGIN=password