diff --git a/manifests/plugins/ml2/opendaylight.pp b/manifests/plugins/ml2/opendaylight.pp index a27c4d641..13b56c4fe 100644 --- a/manifests/plugins/ml2/opendaylight.pp +++ b/manifests/plugins/ml2/opendaylight.pp @@ -29,12 +29,22 @@ # (optional) The URI used to connect to the local OVSDB server # Defaults to 'tcp:127.0.0.1:6639' # +# [*port_binding_controller*] +# (optional) Name of the controller to be used for port binding. +# Defaults to $::os_service_default +# +# [*odl_hostconf_uri*] +# (optional) Path for ODL host configuration REST interface. +# Defaults to $::os_service_default +# class neutron::plugins::ml2::opendaylight ( - $package_ensure = 'present', - $odl_username = $::os_service_default, - $odl_password = $::os_service_default, - $odl_url = $::os_service_default, - $ovsdb_connection = 'tcp:127.0.0.1:6639', + $package_ensure = 'present', + $odl_username = $::os_service_default, + $odl_password = $::os_service_default, + $odl_url = $::os_service_default, + $ovsdb_connection = 'tcp:127.0.0.1:6639', + $port_binding_controller = $::os_service_default, + $odl_hostconf_uri = $::os_service_default, ) { include ::neutron::deps @@ -48,9 +58,11 @@ class neutron::plugins::ml2::opendaylight ( ) neutron_plugin_ml2 { - 'ml2_odl/username': value => $odl_username; - 'ml2_odl/password': value => $odl_password; - 'ml2_odl/url': value => $odl_url; + 'ml2_odl/username': value => $odl_username; + 'ml2_odl/password': value => $odl_password; + 'ml2_odl/url': value => $odl_url; + 'ml2_odl/port_binding_controller': value => $port_binding_controller; + 'ml2_odl/odl_hostconf_uri': value => $odl_hostconf_uri; } neutron_config { diff --git a/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb b/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb index 8e629e06a..94779aa11 100644 --- a/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb +++ b/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb @@ -11,11 +11,13 @@ describe 'neutron::plugins::ml2::opendaylight' do let :default_params do { - :package_ensure => 'present', - :odl_username => '', - :odl_password => '', - :odl_url => '', - :ovsdb_connection => 'tcp:127.0.0.1:6639' + :package_ensure => 'present', + :odl_username => '', + :odl_password => '', + :odl_url => '', + :ovsdb_connection => 'tcp:127.0.0.1:6639', + :port_binding_controller => '', + :odl_hostconf_uri => '' } end @@ -48,6 +50,8 @@ describe 'neutron::plugins::ml2::opendaylight' do is_expected.to contain_neutron_plugin_ml2('ml2_odl/password').with_value(params[:odl_password]) is_expected.to contain_neutron_plugin_ml2('ml2_odl/username').with_value(params[:odl_username]) is_expected.to contain_neutron_plugin_ml2('ml2_odl/url').with_value(params[:odl_url]) + is_expected.to contain_neutron_plugin_ml2('ml2_odl/port_binding_controller').with_value(params[:port_binding_controller]) + is_expected.to contain_neutron_plugin_ml2('ml2_odl/odl_hostconf_uri').with_value(params[:odl_hostconf_uri]) end it 'configures neutron server settings' do