From 271a2587a38c6a396213c95aaa8a690fcc283091 Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Tue, 3 May 2016 18:51:38 -0700 Subject: [PATCH] Fix default keystone auth_plugin for nova/neutron The 'password' plugin in keystoneauth is actually smart enough to discover which endpoint it should be using, defaulting to Identity V3. If 'v3password' is used, the URL must have a version already encoded in it[1]. With just 'password', it will discover the right version by hitting the '/' endpoint [2]. So we should just use the 'password' plugin, which will let users use either unversioned or versioned endpoints as they wish. This should be backwards compatible, as the 'password' plugin will use the v3 endpoint when users have specified 'v3' in the URL. [1] https://bugs.launchpad.net/keystoneauth/+bug/1489927 [2] http://paste.openstack.org/show/494119/ Change-Id: I3416ae594e972e40ff0336779258a887987e46b1 --- manifests/network/neutron.pp | 4 ++-- spec/classes/nova_network_neutron_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/network/neutron.pp b/manifests/network/neutron.pp index 344d500b7..9c72ae74e 100644 --- a/manifests/network/neutron.pp +++ b/manifests/network/neutron.pp @@ -10,7 +10,7 @@ # # [*neutron_auth_type*] # Name of the auth type to load (string value) -# Defaults to 'v3password' +# Defaults to 'password' # # [*neutron_url*] # (optional) URL for connecting to the Neutron networking service. @@ -128,7 +128,7 @@ # class nova::network::neutron ( $neutron_password = false, - $neutron_auth_type = 'v3password', + $neutron_auth_type = 'password', $neutron_project_name = 'services', $neutron_project_domain_name = 'Default', $neutron_username = 'neutron', diff --git a/spec/classes/nova_network_neutron_spec.rb b/spec/classes/nova_network_neutron_spec.rb index 5a7dec33c..9ee7a67c4 100644 --- a/spec/classes/nova_network_neutron_spec.rb +++ b/spec/classes/nova_network_neutron_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe 'nova::network::neutron' do let :default_params do - { :neutron_auth_type => 'v3password', + { :neutron_auth_type => 'password', :neutron_url => 'http://127.0.0.1:9696', :neutron_url_timeout => '30', :neutron_project_name => 'services',