diff --git a/manifests/service_instance.pp b/manifests/service_instance.pp index 1ac836ff..5ca1638c 100644 --- a/manifests/service_instance.pp +++ b/manifests/service_instance.pp @@ -75,9 +75,11 @@ # (optional) Attach share server directly to share network. # Defaults to: false # +# DEPRECATED PARAMETERS +# # [*service_instance_network_helper_type*] # Allowed values are nova, neutron -# Defaults to: neutron +# Defaults to: undef define manila::service_instance ( $create_service_image = true, @@ -97,12 +99,17 @@ define manila::service_instance ( $service_network_division_mask = 28, $interface_driver = 'manila.network.linux.interface.OVSInterfaceDriver', $connect_share_server_to_tenant_network = false, - $service_instance_network_helper_type = 'neutron', + # DEPRECATED PARAMETERS + $service_instance_network_helper_type = undef, ) { include ::manila::deps + if $service_instance_network_helper_type { + warning('service_instance_network_helper_type is deprecated, has no effect, and will be removed in the future.') + } + if $create_service_image { if $service_image_location { glance_image { $service_image_name: @@ -134,6 +141,5 @@ define manila::service_instance ( "${name}/service_network_division_mask": value => $service_network_division_mask; "${name}/interface_driver": value => $interface_driver; "${name}/connect_share_server_to_tenant_network": value => $connect_share_server_to_tenant_network; - "${name}/service_instance_network_helper_type": value => $service_instance_network_helper_type; } } diff --git a/releasenotes/notes/deprecate_service_instance_network_helper_type_parameter-781ea3e658e9c535.yaml b/releasenotes/notes/deprecate_service_instance_network_helper_type_parameter-781ea3e658e9c535.yaml new file mode 100644 index 00000000..8a905d80 --- /dev/null +++ b/releasenotes/notes/deprecate_service_instance_network_helper_type_parameter-781ea3e658e9c535.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - service_instance_network_helper_type is now deprecated for + removal; the parameter has no effect. diff --git a/spec/defines/manila_service_instance_spec.rb b/spec/defines/manila_service_instance_spec.rb index 6fcbd906..26505334 100644 --- a/spec/defines/manila_service_instance_spec.rb +++ b/spec/defines/manila_service_instance_spec.rb @@ -21,7 +21,6 @@ describe 'manila::service_instance' do :service_network_division_mask => 28, :interface_driver => 'manila.network.linux.interface.OVSInterfaceDriver', :connect_share_server_to_tenant_network => false, - :service_instance_network_helper_type => 'neutron', } end