Deprecated quota_items option

The quota_items parameter is deprecated, has no effect and
will be removed after Newton cycle.

Change-Id: I7e193c635822fce99e007b21990bfb5a7c732cb3
This commit is contained in:
ZhongShengping 2016-07-11 16:47:11 +08:00
parent 610de6e98d
commit ceaa75d6c6
3 changed files with 18 additions and 8 deletions

View File

@ -59,10 +59,6 @@
# A negative value means unlimited.
# Defaults to $::os_service_default.
#
# [*quota_items*]
# (optional) Resource name(s) that are supported in quota features.
# Defaults to $::os_service_default.
#
# [*quota_member*]
# (optional) Number of pool members allowed per tenant.
# A negative value means unlimited
@ -86,6 +82,12 @@
# A negative value means unlimited.
# Defaults to $::os_service_default.
#
# DEPRECATED PARAMATERS
#
# [*quota_items*]
# (optional) Resource name(s) that are supported in quota features.
# Defaults to undef
#
class neutron::quota (
$default_quota = $::os_service_default,
$quota_network = $::os_service_default,
@ -102,16 +104,22 @@ class neutron::quota (
$quota_firewall_policy = $::os_service_default,
$quota_firewall_rule = -1,
$quota_health_monitor = $::os_service_default,
$quota_items = $::os_service_default,
$quota_member = $::os_service_default,
$quota_network_gateway = 5,
$quota_packet_filter = 100,
$quota_pool = $::os_service_default,
$quota_vip = $::os_service_default
$quota_vip = $::os_service_default,
#DEPRECATED PAMAMETERS
$quota_items = undef,
) {
include ::neutron::deps
if $quota_items {
warning('quota_items is deprecated, has no effect and will be removed after Newton cycle.')
}
neutron_config {
'quotas/default_quota': value => $default_quota;
'quotas/quota_network': value => $quota_network;
@ -126,7 +134,6 @@ class neutron::quota (
'quotas/quota_firewall_policy': value => $quota_firewall_policy;
'quotas/quota_firewall_rule': value => $quota_firewall_rule;
'quotas/quota_health_monitor': value => $quota_health_monitor;
'quotas/quota_items': value => $quota_items;
'quotas/quota_member': value => $quota_member;
'quotas/quota_network_gateway': value => $quota_network_gateway;
'quotas/quota_packet_filter': value => $quota_packet_filter;

View File

@ -0,0 +1,4 @@
---
deprecations:
- quota_items is deprecated, has no effect and
will be removed after Newton cycle.

View File

@ -48,7 +48,6 @@ describe 'neutron::quota' do
:quota_firewall_policy => 1,
:quota_firewall_rule => -1,
:quota_health_monitor => -1,
:quota_items => 'network,subnet,port',
:quota_member => -1,
:quota_network_gateway => 5,
:quota_packet_filter => 100,