Define region name variables in openrc and clouds.
Add OS_REGION_NAME to the openrc file. Replaces openrc_clouds_yml_region_name with a common openrc_service_region variable. Change-Id: I68cbd6b2aaa64ef655cfc617a96d428fb2c35d2b
This commit is contained in:
parent
ee01beeedf
commit
c6dec23ba1
|
@ -23,7 +23,7 @@ openrc_clouds_yml_interface: internal
|
|||
openrc_os_username: admin
|
||||
openrc_os_tenant_name: admin
|
||||
openrc_os_auth_url: "http://127.0.0.1:5000"
|
||||
openrc_clouds_yml_region_name: RegionOne
|
||||
openrc_region_name: RegionOne
|
||||
|
||||
## Deliberately allow access to SSL endpoints with bad certificates
|
||||
openrc_insecure: "{{ (keystone_service_adminuri_insecure | bool or keystone_service_internaluri_insecure | bool) | default(false) }}"
|
||||
|
|
|
@ -9,7 +9,7 @@ clouds:
|
|||
password: {{ openrc_os_password }}
|
||||
user_domain_name: {{ openrc_os_domain_name }}
|
||||
project_domain_name: {{ openrc_os_domain_name }}
|
||||
region_name: {{ openrc_clouds_yml_region_name }}
|
||||
region_name: {{ openrc_region_name }}
|
||||
interface: {{ openrc_clouds_yml_interface }}
|
||||
{% if openrc_os_auth_url.endswith('v3') %}
|
||||
identity_api_version: "3"
|
||||
|
|
|
@ -17,6 +17,7 @@ export OS_AUTH_URL={{ openrc_os_auth_url }}
|
|||
export OS_NO_CACHE=1
|
||||
export OS_USER_DOMAIN_NAME={{ openrc_os_domain_name }}
|
||||
export OS_PROJECT_DOMAIN_NAME={{ openrc_os_domain_name }}
|
||||
export OS_REGION_NAME={{ openrc_region_name }}
|
||||
|
||||
# For openstackclient
|
||||
{% if openrc_os_auth_url.endswith('v3') %}
|
||||
|
|
Loading…
Reference in New Issue