diff --git a/manifests/quota.pp b/manifests/quota.pp index e7429474d..0d7aa2375 100644 --- a/manifests/quota.pp +++ b/manifests/quota.pp @@ -46,11 +46,6 @@ # (optional) Number of network gateways allowed per tenant, -1 for unlimited. # Defaults to '5'. # -# [*quota_vip*] -# (optional) Number of vips allowed per tenant. -# A negative value means unlimited. -# Defaults to $::os_service_default. -# # [*quota_rbac_policy*] # (optional) Number of rbac policies allowed per tenant. # A negative value means unlimited. @@ -62,6 +57,11 @@ # (optional) Number of packet_filters allowed per tenant, -1 for unlimited. # Defaults to undef. # +# [*quota_vip*] +# (optional) Number of vips allowed per tenant. +# A negative value means unlimited. +# Defaults to undef. +# class neutron::quota ( $default_quota = $::os_service_default, $quota_network = $::os_service_default, @@ -75,11 +75,11 @@ class neutron::quota ( $quota_security_group_rule = $::os_service_default, $quota_driver = $::os_service_default, $quota_network_gateway = 5, - $quota_vip = $::os_service_default, # rbac extension $quota_rbac_policy = $::os_service_default, # DEPRECATED PARAMETERS $quota_packet_filter = undef, + $quota_vip = undef, ) { include neutron::deps @@ -88,6 +88,10 @@ class neutron::quota ( warning('The neutron::quota::quota_packet_filter parameter is deprecated and has no effect') } + if $quota_vip != undef { + warning('The neutron::quota::quota_vip parameter is deprecated and has no effect') + } + neutron_config { 'quotas/default_quota': value => $default_quota; 'quotas/quota_network': value => $quota_network; @@ -99,7 +103,6 @@ class neutron::quota ( 'quotas/quota_security_group_rule': value => $quota_security_group_rule; 'quotas/quota_driver': value => $quota_driver; 'quotas/quota_network_gateway': value => $quota_network_gateway; - 'quotas/quota_vip': value => $quota_vip; 'quotas/quota_rbac_policy': value => $quota_rbac_policy; } } diff --git a/releasenotes/notes/deprecate-quota_vip-0465fddf6d8e3a38.yaml b/releasenotes/notes/deprecate-quota_vip-0465fddf6d8e3a38.yaml new file mode 100644 index 000000000..f9bcf8aca --- /dev/null +++ b/releasenotes/notes/deprecate-quota_vip-0465fddf6d8e3a38.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + The ``neutron::quota::quota_vip`` parameter has been deprecated and has no + effect. diff --git a/spec/classes/neutron_quota_spec.rb b/spec/classes/neutron_quota_spec.rb index 2547d168b..71ec1889e 100644 --- a/spec/classes/neutron_quota_spec.rb +++ b/spec/classes/neutron_quota_spec.rb @@ -39,7 +39,6 @@ describe 'neutron::quota' do :quota_security_group => 20, :quota_security_group_rule => 200, :quota_network_gateway => 5, - :quota_vip => 10, :quota_rbac_policy => 10 }) end