From afb3b3fcc4406593d8db936f502fe824d96abad0 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Tue, 10 May 2016 13:37:45 -0400 Subject: [PATCH] Revert "Fix default keystone auth_plugin for nova/neutron" This reverts commit 271a2587a38c6a396213c95aaa8a690fcc283091. This patch seems to have caused the TripleO upgrades job to fail in that running Nova instances stopped working after an upgrade. Could be there is a missing relationship or something in Puppet or perhaps something else keystone related but updating to this as a default seems it could break things. Related bug: #1580076 Change-Id: I783fba6cbd3ba292d6ed64be2dd0772e20a0896d --- 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 9c72ae74e..344d500b7 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 'password' +# Defaults to 'v3password' # # [*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 = 'password', + $neutron_auth_type = 'v3password', $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 9ee7a67c4..5a7dec33c 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 => 'password', + { :neutron_auth_type => 'v3password', :neutron_url => 'http://127.0.0.1:9696', :neutron_url_timeout => '30', :neutron_project_name => 'services',