From 1b7a253e0914d31ee0746aa15fd712a665196285 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 3 Dec 2016 03:50:00 +0000 Subject: [PATCH] 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 --- README.md | 4 ++-- manifests/init.pp | 12 ++++++------ spec/classes/neutron_init_spec.rb | 2 +- spec/classes/neutron_plugins_ml2_arista_l3_spec.rb | 2 +- spec/classes/neutron_plugins_ml2_arista_spec.rb | 2 +- .../neutron_plugins_ml2_bigswitch_restproxy_spec.rb | 2 +- spec/classes/neutron_plugins_ml2_bigswitch_spec.rb | 2 +- .../neutron_plugins_ml2_cisco_nexus1000v_spec.rb | 2 +- spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb | 2 +- spec/classes/neutron_plugins_ml2_cisco_spec.rb | 2 +- ...eutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb | 2 +- spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb | 2 +- spec/classes/neutron_plugins_ml2_midonet_spec.rb | 2 +- .../classes/neutron_plugins_ml2_opendaylight_spec.rb | 2 +- spec/classes/neutron_plugins_ml2_spec.rb | 4 ++-- .../classes/neutron_plugins_ovs_opendaylight_spec.rb | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 8e4ae30b1..d2cf3c09c 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/manifests/init.pp b/manifests/init.pp index 7eeab86ef..ccc731f62 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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, diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb index 715af11e9..11108714d 100644 --- a/spec/classes/neutron_init_spec.rb +++ b/spec/classes/neutron_init_spec.rb @@ -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', diff --git a/spec/classes/neutron_plugins_ml2_arista_l3_spec.rb b/spec/classes/neutron_plugins_ml2_arista_l3_spec.rb index eb112002c..4b770d483 100644 --- a/spec/classes/neutron_plugins_ml2_arista_l3_spec.rb +++ b/spec/classes/neutron_plugins_ml2_arista_l3_spec.rb @@ -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 diff --git a/spec/classes/neutron_plugins_ml2_arista_spec.rb b/spec/classes/neutron_plugins_ml2_arista_spec.rb index 0f9760358..720fab08c 100644 --- a/spec/classes/neutron_plugins_ml2_arista_spec.rb +++ b/spec/classes/neutron_plugins_ml2_arista_spec.rb @@ -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 diff --git a/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb b/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb index a5ea1baac..930148056 100644 --- a/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb +++ b/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb @@ -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 diff --git a/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb b/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb index ca30c8d10..d79d1b4f3 100644 --- a/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb +++ b/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb @@ -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 diff --git a/spec/classes/neutron_plugins_ml2_cisco_nexus1000v_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_nexus1000v_spec.rb index 2792e1182..7a81b4037 100644 --- a/spec/classes/neutron_plugins_ml2_cisco_nexus1000v_spec.rb +++ b/spec/classes/neutron_plugins_ml2_cisco_nexus1000v_spec.rb @@ -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 diff --git a/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb index 60bb7a7f9..7ce913681 100644 --- a/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb +++ b/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb @@ -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 diff --git a/spec/classes/neutron_plugins_ml2_cisco_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_spec.rb index 450aa0539..8d18329d3 100644 --- a/spec/classes/neutron_plugins_ml2_cisco_spec.rb +++ b/spec/classes/neutron_plugins_ml2_cisco_spec.rb @@ -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 diff --git a/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb index 2c7a08b12..7798dddc1 100644 --- a/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb +++ b/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb @@ -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 diff --git a/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb index 35379f81f..a6b7215ae 100644 --- a/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb +++ b/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb @@ -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 diff --git a/spec/classes/neutron_plugins_ml2_midonet_spec.rb b/spec/classes/neutron_plugins_ml2_midonet_spec.rb index fe67eb4a5..945746847 100644 --- a/spec/classes/neutron_plugins_ml2_midonet_spec.rb +++ b/spec/classes/neutron_plugins_ml2_midonet_spec.rb @@ -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 diff --git a/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb b/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb index 9174b6c7e..57da9bddc 100644 --- a/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb +++ b/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb @@ -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 diff --git a/spec/classes/neutron_plugins_ml2_spec.rb b/spec/classes/neutron_plugins_ml2_spec.rb index 9fdd617b2..19323e908 100644 --- a/spec/classes/neutron_plugins_ml2_spec.rb +++ b/spec/classes/neutron_plugins_ml2_spec.rb @@ -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 diff --git a/spec/classes/neutron_plugins_ovs_opendaylight_spec.rb b/spec/classes/neutron_plugins_ovs_opendaylight_spec.rb index 151d5d3f2..4d64704f0 100644 --- a/spec/classes/neutron_plugins_ovs_opendaylight_spec.rb +++ b/spec/classes/neutron_plugins_ovs_opendaylight_spec.rb @@ -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