openstack
/
puppet-manila
Code Issues Proposed changes

Deprecate standalone_network_plugin_ip_version 

parameter.  It was deprecated for removal in manila proper in
Pike [1] when IPv6 support was added for network plugins.

[1] I96d3389262e9829b8b4344870cdf5c76abd22828

Needed-By: Ic7e5b5351e429755ba48613ab89d1b7e7d6e2d34
Change-Id: Id36fe900ddf10aacbf06dfe5b27e8cf8982c8e30
This commit is contained in:
Tom Barron 2017-10-30 16:05:32 -04:00
parent 1eb6daa912
commit 1c8b2e0cd2
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/network/standalone.pp
View File

@ -25,9 +25,11 @@
# Examples: 10.0.0.10 or 10.0.0.10-10.0.0.20 or
# 10.0.0.10-10.0.0.20,10.0.0.30-10.0.0.40,10.0.0.50
#
# DEPRECATED PARAMETERS
#
# [*standalone_network_plugin_ip_version*]
# (optional) IP version of network. Optional.
# Allowed values are '4' and '6'. Default value is '4'.
# Allowed values are '4' and '6'. Default value is undef.
#
define manila::network::standalone (
@ -35,9 +37,14 @@ define manila::network::standalone (
$standalone_network_plugin_mask,
$standalone_network_plugin_segmentation_id = undef,
$standalone_network_plugin_allowed_ip_ranges = undef,
$standalone_network_plugin_ip_version = '4',
# DEPRECATED PARAMETERS
$standalone_network_plugin_ip_version = undef,
) {
if $standalone_network_plugin_ip_version {
warning('standalone_network_plugin_ip_version is deprecated, has no effect, and will be removed in the future.')
}
$standalone_plugin_name = 'manila.network.standalone_network_plugin.StandaloneNetworkPlugin'
manila_config {
@ -46,6 +53,6 @@ define manila::network::standalone (
"${name}/standalone_network_plugin_mask": value => $standalone_network_plugin_mask;
"${name}/standalone_network_plugin_segmentation_id": value => $standalone_network_plugin_segmentation_id;
"${name}/standalone_network_plugin_allowed_ip_ranges": value => $standalone_network_plugin_allowed_ip_ranges;
"${name}/standalone_network_plugin_ip_version": value => $standalone_network_plugin_ip_version;
}
}

6
releasenotes/notes/deprecate_standalone_network_plugin_ip_version-4df7ff7851f72c2b.yaml Normal file
View File

@ -0,0 +1,6 @@
---
deprecations:
- |
The ``standalone_network_plugin_ip_version`` parameter was
deprecated for removal in pike and has no effect so it is
marked as deprecated here.

12
spec/defines/manila_network_standalone_spec.rb
View File

@ -12,30 +12,20 @@ describe 'manila::network::standalone' do
}
end
let :default_params do
{
:standalone_network_plugin_ip_version => '4',
}
end
shared_examples_for 'standalone network plugin' do
let :params_hash do
default_params.merge(params)
end
it 'configures standalone network plugin' do
is_expected.to contain_manila_config("standalone/network_api_class").with_value(
'manila.network.standalone_network_plugin.StandaloneNetworkPlugin')
params_hash.each_pair do |config,value|
params.each_pair do |config,value|
is_expected.to contain_manila_config("standalone/#{config}").with_value( value )
end
end
end
context 'with default parameters' do
before do
params = {}