diff --git a/lib/puppet/type/neutron_plugin_linuxbridge.rb b/lib/puppet/type/neutron_plugin_linuxbridge.rb index 81e9fa90a..808b8da00 100644 --- a/lib/puppet/type/neutron_plugin_linuxbridge.rb +++ b/lib/puppet/type/neutron_plugin_linuxbridge.rb @@ -3,7 +3,7 @@ Puppet::Type.newtype(:neutron_plugin_linuxbridge) do ensurable newparam(:name, :namevar => true) do - desc 'Section/setting name to manage from linuxbridge_conf.ini' + desc 'Section/setting name to manage from linuxbridge_conf.ini (DEPRECATED)' newvalues(/\S+\/\S+/) end diff --git a/manifests/config.pp b/manifests/config.pp index 292e384fe..e94556d02 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -75,9 +75,6 @@ # [*bgp_dragent_config*] # (optional) Manage configuration of bgp_dragent.ini # -# [*plugin_linuxbridge_config*] -# (optional) Manage configuration of linuxbridge_conf.ini -# # [*plugin_opencontrail_config*] # (optional) Manage configuration of plugins/opencontrail/ContrailPlugin.ini # @@ -95,6 +92,9 @@ # [*plugin_nvp_config*] # (optional) Manage configuration of /etc/neutron/plugins/nicira/nvp.ini # +# [*plugin_linuxbridge_config*] +# (optional) Manage configuration of linuxbridge_conf.ini +# # NOTE: The configuration MUST NOT be already handled by this module # or Puppet catalog compilation will fail with duplicate resources. # @@ -117,13 +117,13 @@ class neutron::config ( $metering_agent_config = {}, $vpnaas_agent_config = {}, $bgp_dragent_config = {}, - $plugin_linuxbridge_config = {}, $plugin_opencontrail_config = {}, $plugin_nuage_config = {}, $plugin_ml2_config = {}, $plugin_nsx_config = {}, # DEPRECATED PARAMETERS $plugin_nvp_config = undef, + $plugin_linuxbridge_config = undef, ) { include neutron::deps @@ -132,6 +132,10 @@ class neutron::config ( warning('The plugin_nvp_config parameter is deprecated and has no effect.') } + if $plugin_linuxbridge_config != undef { + warning('The plugin_linuxbridge_config parameter is deprecated and has no effect.') + } + validate_legacy(Hash, 'validate_hash', $server_config) validate_legacy(Hash, 'validate_hash', $api_paste_ini) validate_legacy(Hash, 'validate_hash', $ovs_agent_config) @@ -150,7 +154,6 @@ class neutron::config ( validate_legacy(Hash, 'validate_hash', $metering_agent_config) validate_legacy(Hash, 'validate_hash', $vpnaas_agent_config) validate_legacy(Hash, 'validate_hash', $bgp_dragent_config) - validate_legacy(Hash, 'validate_hash', $plugin_linuxbridge_config) validate_legacy(Hash, 'validate_hash', $plugin_opencontrail_config) validate_legacy(Hash, 'validate_hash', $plugin_nuage_config) validate_legacy(Hash, 'validate_hash', $plugin_ml2_config) @@ -174,7 +177,6 @@ class neutron::config ( create_resources('neutron_metering_agent_config', $metering_agent_config) create_resources('neutron_vpnaas_agent_config', $vpnaas_agent_config) create_resources('neutron_bgp_dragent_config', $bgp_dragent_config) - create_resources('neutron_plugin_linuxbridge', $plugin_linuxbridge_config) create_resources('neutron_plugin_opencontrail', $plugin_opencontrail_config) create_resources('neutron_plugin_nuage', $plugin_nuage_config) create_resources('neutron_plugin_ml2', $plugin_ml2_config) diff --git a/releasenotes/notes/deprecate-neutron_plugin_linuxbridge-350f4090a187a31e.yaml b/releasenotes/notes/deprecate-neutron_plugin_linuxbridge-350f4090a187a31e.yaml new file mode 100644 index 000000000..f9ee3526c --- /dev/null +++ b/releasenotes/notes/deprecate-neutron_plugin_linuxbridge-350f4090a187a31e.yaml @@ -0,0 +1,9 @@ +--- +features: + - | + The ``neutron::config::plugin_linuxbridge_config`` parameter has been + deprecated and has no effect. + + - | + The ``neutron_plugin_linuxbridge`` resource type has been deprecated and + will be removed in a futrue release. diff --git a/spec/classes/neutron_config_spec.rb b/spec/classes/neutron_config_spec.rb index 7ec7bff1d..42a67ffff 100644 --- a/spec/classes/neutron_config_spec.rb +++ b/spec/classes/neutron_config_spec.rb @@ -141,7 +141,6 @@ describe 'neutron::config' do shared_examples 'neutron_plugin_config' do let :params do { - :plugin_linuxbridge_config => config_hash, :plugin_nsx_config => config_hash, :plugin_opencontrail_config => config_hash, :plugin_nuage_config => config_hash, @@ -149,12 +148,6 @@ describe 'neutron::config' do } end - it 'configures arbitrary neutron_plugin_linuxbridge configurations' do - should contain_neutron_plugin_linuxbridge('DEFAULT/foo').with_value('fooValue') - should contain_neutron_plugin_linuxbridge('DEFAULT/bar').with_value('barValue') - should contain_neutron_plugin_linuxbridge('DEFAULT/baz').with_ensure('absent') - end - it 'configures arbitrary neutron_plugin_nsx configurations' do should contain_neutron_plugin_nsx('DEFAULT/foo').with_value('fooValue') should contain_neutron_plugin_nsx('DEFAULT/bar').with_value('barValue')