Changed default for core_plugin to ml2
The 'openvswitch' plugin does not exist since Juno. Also, changed how we set core_plugin for ML2, using stevedore name instead of import path. Change-Id: Ifb79ee2e648a5c8ac1defbdb86adca16d0f526ad
This commit is contained in:
parent
cbe9fd1207
commit
1b7a253e09
@ -105,11 +105,11 @@ The `neutron_config` provider is a children of the ini_setting provider. It allo
|
||||
|
||||
```puppet
|
||||
neutron_config { 'DEFAULT/core_plugin' :
|
||||
value => openvswitch,
|
||||
value => ml2,
|
||||
}
|
||||
```
|
||||
|
||||
This will write `core_plugin=openvswitch` in the `[DEFAULT]` section.
|
||||
This will write `core_plugin=ml2` in the `[DEFAULT]` section.
|
||||
|
||||
##### name
|
||||
|
||||
|
@ -27,14 +27,14 @@
|
||||
#
|
||||
# [*core_plugin*]
|
||||
# (optional) Neutron plugin provider
|
||||
# Defaults to openvswitch
|
||||
# Could be bigswitch, brocade, cisco, embrane, hyperv, linuxbridge, midonet,
|
||||
# ml2, mlnx, nec, nicira, plumgrid, ryu, nuage, opencontrail (full path)
|
||||
# Defaults to ml2
|
||||
# Could be bigswitch, brocade, cisco, embrane, hyperv, midonet,
|
||||
# ml2, mlnx, nec, nicira, plumgrid, ryu, nuage, opencontrail
|
||||
#
|
||||
# Example for opencontrail:
|
||||
# Example for nuage:
|
||||
#
|
||||
# class {'neutron' :
|
||||
# core_plugin => 'neutron.plugins.opencontrail.contrail_plugin:NeutronPluginContrailCoreV2'
|
||||
# core_plugin => 'nuage'
|
||||
# }
|
||||
#
|
||||
# [*service_plugins*]
|
||||
@ -381,7 +381,7 @@ class neutron (
|
||||
$debug = undef,
|
||||
$bind_host = $::os_service_default,
|
||||
$bind_port = $::os_service_default,
|
||||
$core_plugin = 'openvswitch',
|
||||
$core_plugin = 'ml2',
|
||||
$service_plugins = $::os_service_default,
|
||||
$auth_strategy = 'keystone',
|
||||
$base_mac = $::os_service_default,
|
||||
|
@ -4,7 +4,7 @@ describe 'neutron' do
|
||||
|
||||
let :params do
|
||||
{ :package_ensure => 'present',
|
||||
:core_plugin => 'linuxbridge',
|
||||
:core_plugin => 'ml2',
|
||||
:auth_strategy => 'keystone',
|
||||
:rabbit_password => 'guest',
|
||||
:log_dir => '/var/log/neutron',
|
||||
|
@ -28,7 +28,7 @@ describe 'neutron::plugins::ml2::arista::l3' do
|
||||
class { 'neutron::server': }
|
||||
class { 'neutron':
|
||||
rabbit_password => 'passw0rd',
|
||||
core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
|
||||
core_plugin => 'ml2' }"
|
||||
end
|
||||
|
||||
let :default_params do
|
||||
|
@ -28,7 +28,7 @@ describe 'neutron::plugins::ml2::arista' do
|
||||
class { 'neutron::server': }
|
||||
class { 'neutron':
|
||||
rabbit_password => 'passw0rd',
|
||||
core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
|
||||
core_plugin => 'ml2' }"
|
||||
end
|
||||
|
||||
let :default_params do
|
||||
|
@ -13,7 +13,7 @@ describe 'neutron::plugins::ml2::bigswitch::restproxy' do
|
||||
class { 'neutron::server': }
|
||||
class { 'neutron':
|
||||
rabbit_password => 'passw0rd',
|
||||
core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
|
||||
core_plugin => 'ml2' }"
|
||||
end
|
||||
|
||||
let :required_params do
|
||||
|
@ -9,7 +9,7 @@ describe 'neutron::plugins::ml2::bigswitch' do
|
||||
class { 'neutron::server': }
|
||||
class { 'neutron':
|
||||
rabbit_password => 'passw0rd',
|
||||
core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
|
||||
core_plugin => 'ml2' }"
|
||||
end
|
||||
|
||||
let :default_params do
|
||||
|
@ -13,7 +13,7 @@ describe 'neutron::plugins::ml2::cisco::nexus1000v' do
|
||||
class { 'neutron::server': }
|
||||
class { 'neutron':
|
||||
rabbit_password => 'passw0rd',
|
||||
core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
|
||||
core_plugin => 'ml2' }"
|
||||
end
|
||||
|
||||
let :default_params do
|
||||
|
@ -13,7 +13,7 @@ describe 'neutron::plugins::ml2::cisco::nexus' do
|
||||
class { 'neutron::server': }
|
||||
class { 'neutron':
|
||||
rabbit_password => 'passw0rd',
|
||||
core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
|
||||
core_plugin => 'ml2' }"
|
||||
end
|
||||
|
||||
let :default_params do
|
||||
|
@ -9,7 +9,7 @@ describe 'neutron::plugins::ml2::cisco' do
|
||||
class { 'neutron::server': }
|
||||
class { 'neutron':
|
||||
rabbit_password => 'passw0rd',
|
||||
core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
|
||||
core_plugin => 'ml2' }"
|
||||
end
|
||||
|
||||
let :default_params do
|
||||
|
@ -13,7 +13,7 @@ describe 'neutron::plugins::ml2::cisco::type_nexus_vxlan' do
|
||||
class { 'neutron::server': }
|
||||
class { 'neutron':
|
||||
rabbit_password => 'passw0rd',
|
||||
core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
|
||||
core_plugin => 'ml2' }"
|
||||
end
|
||||
|
||||
let :default_params do
|
||||
|
@ -13,7 +13,7 @@ describe 'neutron::plugins::ml2::cisco::ucsm' do
|
||||
class { 'neutron::server': }
|
||||
class { 'neutron':
|
||||
rabbit_password => 'passw0rd',
|
||||
core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
|
||||
core_plugin => 'ml2' }"
|
||||
end
|
||||
|
||||
let :default_params do
|
||||
|
@ -13,7 +13,7 @@ describe 'neutron::plugins::ml2::midonet' do
|
||||
class { 'neutron::server': }
|
||||
class { 'neutron':
|
||||
rabbit_password => 'passw0rd',
|
||||
core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
|
||||
core_plugin => 'ml2' }"
|
||||
end
|
||||
|
||||
let :default_params do
|
||||
|
@ -9,7 +9,7 @@ describe 'neutron::plugins::ml2::opendaylight' do
|
||||
class { 'neutron::server': }
|
||||
class { 'neutron':
|
||||
rabbit_password => 'passw0rd',
|
||||
core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
|
||||
core_plugin => 'ml2' }"
|
||||
end
|
||||
|
||||
let :default_params do
|
||||
|
@ -25,7 +25,7 @@ describe 'neutron::plugins::ml2' do
|
||||
let :pre_condition do
|
||||
"class { 'neutron':
|
||||
rabbit_password => 'passw0rd',
|
||||
core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
|
||||
core_plugin => 'ml2' }"
|
||||
end
|
||||
|
||||
let :default_params do
|
||||
@ -61,7 +61,7 @@ describe 'neutron::plugins::ml2' do
|
||||
it { is_expected.to contain_class('neutron::params') }
|
||||
|
||||
it 'configures neutron.conf' do
|
||||
is_expected.to contain_neutron_config('DEFAULT/core_plugin').with_value('neutron.plugins.ml2.plugin.Ml2Plugin')
|
||||
is_expected.to contain_neutron_config('DEFAULT/core_plugin').with_value('ml2')
|
||||
end
|
||||
|
||||
it 'passes purge to resource' do
|
||||
|
@ -9,7 +9,7 @@ describe 'neutron::plugins::ovs::opendaylight' do
|
||||
class { 'neutron::server': }
|
||||
class { 'neutron':
|
||||
rabbit_password => 'passw0rd',
|
||||
core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
|
||||
core_plugin => 'ml2' }"
|
||||
end
|
||||
|
||||
let :default_params do
|
||||
|
Loading…
Reference in New Issue
Block a user