diff --git a/examples/neutron.pp b/examples/neutron.pp index 901e01a9b..2d70c2202 100644 --- a/examples/neutron.pp +++ b/examples/neutron.pp @@ -8,7 +8,7 @@ class { 'neutron': rabbit_password => 'password', rabbit_user => 'guest', rabbit_host => 'localhost', - service_plugins => ['neutron.services.metering.metering_plugin.MeteringPlugin'] + service_plugins => ['metering'] } # The API server talks to keystone for authorisation diff --git a/manifests/init.pp b/manifests/init.pp index e3e655891..9d6ff2f48 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -31,27 +31,13 @@ # # [*core_plugin*] # (optional) Neutron plugin provider -# Defaults to neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 (Open-vSwitch) -# Could be: -# neutron.plugins.bigswitch.plugin.NeutronRestProxyV2 -# neutron.plugins.brocade.NeutronPlugin.BrocadePluginV2 -# neutron.plugins.cisco.network_plugin.PluginV2 -# neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2 -# neutron.plugins.midonet.plugin.MidonetPluginV2 -# neutron.plugins.ml2.plugin.Ml2Plugin -# neutron.plugins.nec.nec_plugin.NECPluginV2 -# neutron.plugins.nicira.NeutronPlugin.NvpPluginV2 -# neutron.plugins.plumgrid.plumgrid_plugin.plumgrid_plugin.NeutronPluginPLUMgridV2 -# neutron.plugins.ryu.ryu_neutron_plugin.RyuNeutronPluginV2 +# Defaults to openvswitch +# Could be bigswitch, brocade, cisco, embrane, hyperv, linuxbridge, midonet, ml2, mlnx, nec, nicira, plumgrid, ryu # # [*service_plugins*] # (optional) Advanced service modules. # Could be an array that can have these elements: -# neutron.services.firewall.fwaas_plugin.FirewallPlugin -# neutron.services.loadbalancer.plugin.LoadBalancerPlugin -# neutron.services.vpn.plugin.VPNDriverPlugin -# neutron.services.metering.metering_plugin.MeteringPlugin -# neutron.services.l3_router.l3_router_plugin.L3RouterPlugin +# router, firewall, lbaas, vpnaas, metering # Defaults to empty # # [*auth_strategy*] @@ -141,7 +127,7 @@ class neutron ( $debug = false, $bind_host = '0.0.0.0', $bind_port = '9696', - $core_plugin = 'neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2', + $core_plugin = 'openvswitch', $service_plugins = undef, $auth_strategy = 'keystone', $base_mac = 'fa:16:3e:00:00:00', diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb index 93ef5a656..470abf341 100644 --- a/spec/classes/neutron_init_spec.rb +++ b/spec/classes/neutron_init_spec.rb @@ -6,7 +6,7 @@ describe 'neutron' do { :package_ensure => 'present', :verbose => false, :debug => false, - :core_plugin => 'neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2', + :core_plugin => 'linuxbridge', :rabbit_host => '127.0.0.1', :rabbit_port => 5672, :rabbit_hosts => false, @@ -159,12 +159,12 @@ describe 'neutron' do shared_examples_for 'with service_plugins' do before do params.merge!( - :service_plugins => ['neutron.services.firewall.fwaas_plugin.FirewallPlugin','neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.vpn.plugin.VPNDriverPlugin'] + :service_plugins => ['router','firewall','lbaas','vpnaas','metering'] ) end it do - should contain_neutron_config('DEFAULT/service_plugins').with_value('neutron.services.firewall.fwaas_plugin.FirewallPlugin,neutron.services.loadbalancer.plugin.LoadBalancerPlugin,neutron.services.vpn.plugin.VPNDriverPlugin') + should contain_neutron_config('DEFAULT/service_plugins').with_value('router,firewall,lbaas,vpnaas,metering') end end