openstack/puppet-manila
Code Issues Proposed changes

Deprecate service_instance_network_helper_type

Browse Source 
parameter.  It was removed from manila proper in Ocata when
nova network support was removed [1].

[1] I846b760fa7c01f7f86768399a2bfad9ced7e57cd

Change-Id: I6553c8064650d220b6cde472a8488e64b5f378eb
This commit is contained in:
Tom Barron 2017-10-30 15:18:32 -04:00
parent 1eb6daa912
commit 5955b37b9b
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/service_instance.pp
View File

@ -75,9 +75,11 @@
# (optional) Attach share server directly to share network. # (optional) Attach share server directly to share network.
# Defaults to: false # Defaults to: false
# #
# DEPRECATED PARAMETERS
#
# [*service_instance_network_helper_type*] # [*service_instance_network_helper_type*]
# Allowed values are nova, neutron # Allowed values are nova, neutron
# Defaults to: neutron # Defaults to: undef
define manila::service_instance ( define manila::service_instance (
$create_service_image = true, $create_service_image = true,
@ -97,12 +99,17 @@ define manila::service_instance (
$service_network_division_mask = 28, $service_network_division_mask = 28,
$interface_driver = 'manila.network.linux.interface.OVSInterfaceDriver', $interface_driver = 'manila.network.linux.interface.OVSInterfaceDriver',
$connect_share_server_to_tenant_network = false, $connect_share_server_to_tenant_network = false,
$service_instance_network_helper_type = 'neutron', # DEPRECATED PARAMETERS
$service_instance_network_helper_type = undef,
) { ) {
include ::manila::deps 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 $create_service_image {
if $service_image_location { if $service_image_location {
glance_image { $service_image_name: glance_image { $service_image_name:
@ -134,6 +141,5 @@ define manila::service_instance (
"${name}/service_network_division_mask": value => $service_network_division_mask; "${name}/service_network_division_mask": value => $service_network_division_mask;
"${name}/interface_driver": value => $interface_driver; "${name}/interface_driver": value => $interface_driver;
"${name}/connect_share_server_to_tenant_network": value => $connect_share_server_to_tenant_network; "${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;
} }
} }

4
releasenotes/notes/deprecate_service_instance_network_helper_type_parameter-781ea3e658e9c535.yaml Normal file
View File

@ -0,0 +1,4 @@
---
deprecations:
- service_instance_network_helper_type is now deprecated for
removal; the parameter has no effect.

1
spec/defines/manila_service_instance_spec.rb
View File

@ -21,7 +21,6 @@ describe 'manila::service_instance' do
:service_network_division_mask => 28, :service_network_division_mask => 28,
:interface_driver => 'manila.network.linux.interface.OVSInterfaceDriver', :interface_driver => 'manila.network.linux.interface.OVSInterfaceDriver',
:connect_share_server_to_tenant_network => false, :connect_share_server_to_tenant_network => false,
:service_instance_network_helper_type => 'neutron',
} }
end end