openstack
/
puppet-nova
Code Issues Proposed changes

Revert "Fix default keystone auth_plugin for nova/neutron" 

This reverts commit 271a2587a3.

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
This commit is contained in:
Dan Prince 2016-05-10 13:37:45 -04:00
parent 6e13b38256
commit afb3b3fcc4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/network/neutron.pp
View File

@ -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',

2
spec/classes/nova_network_neutron_spec.rb
View File

@ -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',