openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix Bash variable expansion issues in openrc file"

Browse Source
This commit is contained in:
Zuul 2023-05-16 01:58:48 +00:00 committed by Gerrit Code Review
commit be1ca8a910
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,24 +2,24 @@
# 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_USER_DOMAIN_NAME=Default
export OS_PROJECT_NAME={{ keystone_admin_project }}
export OS_TENANT_NAME={{ keystone_admin_project }}
export OS_USERNAME={{ keystone_admin_user }}
export OS_PASSWORD={{ keystone_admin_password }}
export OS_AUTH_URL={{ keystone_internal_url }}
export OS_INTERFACE=internal
export OS_ENDPOINT_TYPE=internalURL
export OS_PROJECT_DOMAIN_NAME='Default'
export OS_USER_DOMAIN_NAME='Default'
export OS_PROJECT_NAME='{{ keystone_admin_project }}'
export OS_TENANT_NAME='{{ keystone_admin_project }}'
export OS_USERNAME='{{ keystone_admin_user }}'
export OS_PASSWORD='{{ keystone_admin_password }}'
export OS_AUTH_URL='{{ keystone_internal_url }}'
export OS_INTERFACE='internal'
export OS_ENDPOINT_TYPE='internalURL'
{% if enable_manila | bool %}
export OS_MANILA_ENDPOINT_TYPE=internalURL
export OS_MANILA_ENDPOINT_TYPE='internalURL'
{% endif %}
{% if enable_mistral | bool %}
export OS_MISTRAL_ENDPOINT_TYPE=internalURL
export OS_MISTRAL_ENDPOINT_TYPE='internalURL'
{% endif %}
export OS_IDENTITY_API_VERSION=3
export OS_REGION_NAME={{ openstack_region_name }}
export OS_AUTH_PLUGIN=password
export OS_IDENTITY_API_VERSION='3'
export OS_REGION_NAME='{{ openstack_region_name }}'
export OS_AUTH_PLUGIN='password'
{% if kolla_admin_openrc_cacert is not none and kolla_admin_openrc_cacert | length > 0 %}
export OS_CACERT={{ kolla_admin_openrc_cacert }}
export OS_CACERT='{{ kolla_admin_openrc_cacert }}'
{% endif %}

16
ansible/roles/octavia/templates/octavia-openrc.sh.j2
View File

@ -1,10 +1,10 @@
# 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_USER_DOMAIN_NAME=Default
export OS_PROJECT_NAME={{ octavia_service_auth_project }}
export OS_USERNAME={{ octavia_keystone_user }}
export OS_PASSWORD={{ octavia_keystone_password }}
export OS_AUTH_URL={{ keystone_internal_url }}
export OS_INTERFACE=internal
export OS_ENDPOINT_TYPE=internalURL
export OS_PROJECT_DOMAIN_NAME='Default'
export OS_USER_DOMAIN_NAME='Default'
export OS_PROJECT_NAME='{{ octavia_service_auth_project }}'
export OS_USERNAME='{{ octavia_keystone_user }}'
export OS_PASSWORD='{{ octavia_keystone_password }}'
export OS_AUTH_URL='{{ keystone_internal_url }}'
export OS_INTERFACE='internal'
export OS_ENDPOINT_TYPE='internalURL'