openstack/puppet-openstack_extras
Code Issues Proposed changes

authfile: fix OS_IDENTITY_API_VERSION

Browse Source 
In a previous commit (I did, mea culpa), I set IDENTITY_API_VERSION
while we should use OS_IDENTITY_API_VERSION.

Change-Id: I625adb5d8ef1898bd9a44a76a09b3f985146c96c
This commit is contained in:
Emilien Macchi 2016-02-16 17:25:07 -05:00
parent ba4161b468
commit 67a21c9a8d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spec/classes/openstack_extras_auth_file_spec.rb
View File

@ -24,7 +24,7 @@ describe 'openstack_extras::auth_file' do
'export KEYSTONE_ENDPOINT_TYPE=\'publicURL\'', 'export KEYSTONE_ENDPOINT_TYPE=\'publicURL\'',
'export NOVA_ENDPOINT_TYPE=\'publicURL\'', 'export NOVA_ENDPOINT_TYPE=\'publicURL\'',
'export NEUTRON_ENDPOINT_TYPE=\'publicURL\'', 'export NEUTRON_ENDPOINT_TYPE=\'publicURL\'',
'export IDENTITY_API_VERSION=\'3\'', 'export OS_IDENTITY_API_VERSION=\'3\'',
]) ])
end end
end end
@ -73,7 +73,7 @@ describe 'openstack_extras::auth_file' do
'export KEYSTONE_ENDPOINT_TYPE=\'internalURL\'', 'export KEYSTONE_ENDPOINT_TYPE=\'internalURL\'',
'export NOVA_ENDPOINT_TYPE=\'internalURL\'', 'export NOVA_ENDPOINT_TYPE=\'internalURL\'',
'export NEUTRON_ENDPOINT_TYPE=\'internalURL\'', 'export NEUTRON_ENDPOINT_TYPE=\'internalURL\'',
'export IDENTITY_API_VERSION=\'3.1\'', 'export OS_IDENTITY_API_VERSION=\'3.1\'',
]) ])
end end
end end

2
templates/openrc.erb
View File

@ -26,4 +26,4 @@ export GLANCE_ENDPOINT_TYPE='<%= @glance_endpoint_type %>'
export KEYSTONE_ENDPOINT_TYPE='<%= @keystone_endpoint_type %>' export KEYSTONE_ENDPOINT_TYPE='<%= @keystone_endpoint_type %>'
export NOVA_ENDPOINT_TYPE='<%= @nova_endpoint_type %>' export NOVA_ENDPOINT_TYPE='<%= @nova_endpoint_type %>'
export NEUTRON_ENDPOINT_TYPE='<%= @neutron_endpoint_type %>' export NEUTRON_ENDPOINT_TYPE='<%= @neutron_endpoint_type %>'
export IDENTITY_API_VERSION='<%= @identity_api_version %>' export OS_IDENTITY_API_VERSION='<%= @identity_api_version %>'