From 67a21c9a8d7c3a560b52e02db831cff72e194641 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 16 Feb 2016 17:25:07 -0500 Subject: [PATCH] authfile: fix OS_IDENTITY_API_VERSION In a previous commit (I did, mea culpa), I set IDENTITY_API_VERSION while we should use OS_IDENTITY_API_VERSION. Change-Id: I625adb5d8ef1898bd9a44a76a09b3f985146c96c --- spec/classes/openstack_extras_auth_file_spec.rb | 4 ++-- templates/openrc.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/classes/openstack_extras_auth_file_spec.rb b/spec/classes/openstack_extras_auth_file_spec.rb index 31652c1..57ab2b4 100644 --- a/spec/classes/openstack_extras_auth_file_spec.rb +++ b/spec/classes/openstack_extras_auth_file_spec.rb @@ -24,7 +24,7 @@ describe 'openstack_extras::auth_file' do 'export KEYSTONE_ENDPOINT_TYPE=\'publicURL\'', 'export NOVA_ENDPOINT_TYPE=\'publicURL\'', 'export NEUTRON_ENDPOINT_TYPE=\'publicURL\'', - 'export IDENTITY_API_VERSION=\'3\'', + 'export OS_IDENTITY_API_VERSION=\'3\'', ]) end end @@ -73,7 +73,7 @@ describe 'openstack_extras::auth_file' do 'export KEYSTONE_ENDPOINT_TYPE=\'internalURL\'', 'export NOVA_ENDPOINT_TYPE=\'internalURL\'', 'export NEUTRON_ENDPOINT_TYPE=\'internalURL\'', - 'export IDENTITY_API_VERSION=\'3.1\'', + 'export OS_IDENTITY_API_VERSION=\'3.1\'', ]) end end diff --git a/templates/openrc.erb b/templates/openrc.erb index 727b891..e8fc5e5 100644 --- a/templates/openrc.erb +++ b/templates/openrc.erb @@ -26,4 +26,4 @@ export GLANCE_ENDPOINT_TYPE='<%= @glance_endpoint_type %>' export KEYSTONE_ENDPOINT_TYPE='<%= @keystone_endpoint_type %>' export NOVA_ENDPOINT_TYPE='<%= @nova_endpoint_type %>' export NEUTRON_ENDPOINT_TYPE='<%= @neutron_endpoint_type %>' -export IDENTITY_API_VERSION='<%= @identity_api_version %>' +export OS_IDENTITY_API_VERSION='<%= @identity_api_version %>'