Browse Source

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
tags/9.0.0
Colleen Murphy 3 years ago
parent
commit
271a2587a3
2 changed files with 3 additions and 3 deletions
  1. 2
    2
      manifests/network/neutron.pp
  2. 1
    1
      spec/classes/nova_network_neutron_spec.rb

+ 2
- 2
manifests/network/neutron.pp View File

@@ -10,7 +10,7 @@
10 10
 #
11 11
 # [*neutron_auth_type*]
12 12
 #   Name of the auth type to load (string value)
13
-#   Defaults to 'v3password'
13
+#   Defaults to 'password'
14 14
 #
15 15
 # [*neutron_url*]
16 16
 #   (optional) URL for connecting to the Neutron networking service.
@@ -128,7 +128,7 @@
128 128
 #
129 129
 class nova::network::neutron (
130 130
   $neutron_password                = false,
131
-  $neutron_auth_type               = 'v3password',
131
+  $neutron_auth_type               = 'password',
132 132
   $neutron_project_name            = 'services',
133 133
   $neutron_project_domain_name     = 'Default',
134 134
   $neutron_username                = 'neutron',

+ 1
- 1
spec/classes/nova_network_neutron_spec.rb View File

@@ -3,7 +3,7 @@ require 'spec_helper'
3 3
 describe 'nova::network::neutron' do
4 4
 
5 5
   let :default_params do
6
-    { :neutron_auth_type               => 'v3password',
6
+    { :neutron_auth_type               => 'password',
7 7
       :neutron_url                     => 'http://127.0.0.1:9696',
8 8
       :neutron_url_timeout             => '30',
9 9
       :neutron_project_name            => 'services',

Loading…
Cancel
Save