diff --git a/manifests/quota.pp b/manifests/quota.pp index 5f6fcc5da..54937e692 100644 --- a/manifests/quota.pp +++ b/manifests/quota.pp @@ -54,7 +54,7 @@ # (optional) Number of firewalls rules allowed per tenant, -1 for unlimited. # Defaults to '-1'. # -# [*quota_health_monitor*] +# [*quota_healthmonitor*] # (optional) Number of health monitors allowed per tenant. # A negative value means unlimited. # Defaults to $::os_service_default. @@ -87,6 +87,13 @@ # A negative value means unlimited. # Defaults to $::os_service_default. # +# +# DEPRECATED +# [*quota_health_monitor*] +# (optional) Number of health monitors allowed per tenant. +# A negative value means unlimited. +# Defaults to undef +# class neutron::quota ( $default_quota = $::os_service_default, $quota_network = $::os_service_default, @@ -102,17 +109,26 @@ class neutron::quota ( $quota_firewall = $::os_service_default, $quota_firewall_policy = $::os_service_default, $quota_firewall_rule = -1, - $quota_health_monitor = $::os_service_default, + $quota_healthmonitor = $::os_service_default, $quota_member = $::os_service_default, $quota_network_gateway = 5, $quota_packet_filter = 100, $quota_loadbalancer = $::os_service_default, $quota_pool = $::os_service_default, $quota_vip = $::os_service_default, + #DEPRECATED ARGS + $quota_health_monitor = undef, ) { include ::neutron::deps + if $quota_health_monitor and is_service_default($quota_healthmonitor) { + warning('quota_health_monitor is deprecated, use quota_healthmonitor') + $quota_healthmonitor_real = $quota_health_monitor + } else { + $quota_healthmonitor_real = $quota_healthmonitor + } + neutron_config { 'quotas/default_quota': value => $default_quota; 'quotas/quota_network': value => $quota_network; @@ -126,7 +142,7 @@ class neutron::quota ( 'quotas/quota_firewall': value => $quota_firewall; '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_healthmonitor': value => $quota_healthmonitor_real; 'quotas/quota_member': value => $quota_member; 'quotas/quota_network_gateway': value => $quota_network_gateway; 'quotas/quota_packet_filter': value => $quota_packet_filter; diff --git a/releasenotes/notes/fixup-quota-healthmonitor-option-f8e48416bfeef79d.yaml b/releasenotes/notes/fixup-quota-healthmonitor-option-f8e48416bfeef79d.yaml new file mode 100644 index 000000000..31b88d2e6 --- /dev/null +++ b/releasenotes/notes/fixup-quota-healthmonitor-option-f8e48416bfeef79d.yaml @@ -0,0 +1,7 @@ +--- +deprecations: + - The option neutron::quota::quota_health_monitor now has no effect +fixes: + - | + The option neutron::quota::quota_health_monitor was incorrect it should + be neutron::quota::quota_healthmonitor and has been renamed as such. diff --git a/spec/classes/neutron_quota_spec.rb b/spec/classes/neutron_quota_spec.rb index 077ce4b09..dd217ee34 100644 --- a/spec/classes/neutron_quota_spec.rb +++ b/spec/classes/neutron_quota_spec.rb @@ -47,7 +47,7 @@ describe 'neutron::quota' do :quota_firewall => 1, :quota_firewall_policy => 1, :quota_firewall_rule => -1, - :quota_health_monitor => -1, + :quota_healthmonitor => -1, :quota_member => -1, :quota_network_gateway => 5, :quota_packet_filter => 100,