openstack
/
openstack-ansible-openstack_openrc
Code Issues Proposed changes

Make keystone v3 endpoints the default 

The logic which previously implemented a
check for v3 in the endpoint does not work
with versionless endpoints.

As versionless endpoints are likely to be
more common, and the v3 auth protocol is
now the defult and the norm, the check is
now done for a v2 endpoint instead.

Related-Bug: #1688320
Change-Id: If4818e6220aba921890e647cfb21e078bb254821
This commit is contained in:
Jesse Pretorius 2017-07-19 11:52:56 +01:00
parent 26c5822c8c
commit 2d65f03066
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/clouds.yaml.j2
View File

@ -11,8 +11,8 @@ clouds:
project_domain_name: {{ openrc_os_domain_name }}
region_name: {{ openrc_region_name }}
interface: {{ openrc_clouds_yml_interface }}
{% if openrc_os_auth_url.endswith('v3') %}
identity_api_version: "3"
{% else %}
{% if openrc_os_auth_url.endswith('v2.0') %}
identity_api_version: "2.0"
{% else %}
identity_api_version: "3"
{% endif %}

8
templates/openrc.j2
View File

@ -21,12 +21,12 @@ 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') %}
export OS_IDENTITY_API_VERSION=3
export OS_AUTH_VERSION=3
{% else %}
{% if openrc_os_auth_url.endswith('v2.0') %}
export OS_IDENTITY_API_VERSION=2.0
export OS_AUTH_VERSION=2
{% else %}
export OS_IDENTITY_API_VERSION=3
export OS_AUTH_VERSION=3
{% endif %}
{% if openrc_insecure | bool %}