Merge "Cleanup deprecated standalone_network_plugin_ip_version"

This commit is contained in:
Zuul 2020-04-27 15:55:35 +00:00 committed by Gerrit Code Review
commit 24f1114802
2 changed files with 4 additions and 13 deletions

View File

@ -31,13 +31,6 @@
# [*network_plugin_ipv6_enabled*]
# (optional) whether to support IPv6 network resource
#
# DEPRECATED PARAMETERS
#
# [*standalone_network_plugin_ip_version*]
# (optional) IP version of network. Optional.
# Allowed values are '4' and '6'. Default value is undef.
#
define manila::network::standalone (
$standalone_network_plugin_gateway,
$standalone_network_plugin_mask,
@ -45,14 +38,8 @@ define manila::network::standalone (
$standalone_network_plugin_allowed_ip_ranges = undef,
$network_plugin_ipv4_enabled = $::os_service_default,
$network_plugin_ipv6_enabled = $::os_service_default,
# 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 {

View File

@ -0,0 +1,4 @@
---
deprecations:
- |
The ``standalone_network_plugin_ip_version`` parameter has been removed.