openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "Deprecate allow_sorting and allow_pagination options"

This commit is contained in:
Jenkins 2016-08-30 14:32:22 +00:00 committed by Gerrit Code Review
parent b413fbe656 1af926405d
commit c3c971adcb
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
manifests/init.pp
View File

@ -83,14 +83,6 @@
# (optional) Enable bulk crud operations
# Defaults to $::os_service_default
#
# [*allow_pagination*]
# (optional) Enable pagination
# Defaults to $::os_service_default
#
# [*allow_sorting*]
# (optional) Enable sorting
# Defaults to $::os_service_default
#
# [*allow_overlapping_ips*]
# (optional) Enables network namespaces
# Defaults to $::os_service_default
@ -373,6 +365,14 @@
# (optional) VMs will receive DHCP and RA MTU option when the network's preferred MTU is known
# Defaults to undef
#
# [*allow_sorting*]
# (optional) Enable sorting
# Defaults to undef
#
# [*allow_pagination*]
# (optional) Enable pagination
# Defaults to undef
#
class neutron (
$enabled = true,
$package_ensure = 'present',
@ -391,8 +391,6 @@ class neutron (
$global_physnet_mtu = $::os_service_default,
$dhcp_agent_notification = $::os_service_default,
$allow_bulk = $::os_service_default,
$allow_pagination = $::os_service_default,
$allow_sorting = $::os_service_default,
$allow_overlapping_ips = $::os_service_default,
$api_extensions_path = $::os_service_default,
$root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
@ -457,6 +455,8 @@ class neutron (
$verbose = undef,
$log_facility = undef,
$advertise_mtu = undef,
$allow_pagination = undef,
$allow_sorting = undef,
) {
include ::neutron::deps
@ -499,6 +499,14 @@ class neutron (
warning('advertise_mtu is deprecated, has no effect and will be removed in Ocata.')
}
if $allow_sorting {
warning('allow_sorting is deprecated, has no effect and will be removed in a future release.')
}
if $allow_pagination {
warning('allow_pagination is deprecated, has no effect and will be removed in a future release.')
}
if $memcache_servers {
validate_array($memcache_servers)
}
@ -526,8 +534,6 @@ class neutron (
'DEFAULT/dhcp_agents_per_network': value => $dhcp_agents_per_network;
'DEFAULT/dhcp_agent_notification': value => $dhcp_agent_notification;
'DEFAULT/allow_bulk': value => $allow_bulk;
'DEFAULT/allow_pagination': value => $allow_pagination;
'DEFAULT/allow_sorting': value => $allow_sorting;
'DEFAULT/allow_overlapping_ips': value => $allow_overlapping_ips;
'DEFAULT/api_extensions_path': value => $api_extensions_path;
'DEFAULT/state_path': value => $state_path;

4
releasenotes/notes/deprecate_allow_sorting_allow_pagination_options-451a3d961df892d2.yaml Normal file
View File

@ -0,0 +1,4 @@
---
deprecations:
- The ``allow_sorting`` and ``allow_pagination`` configuration options
are deprecated and will be removed in a future release.

2
spec/classes/neutron_init_spec.rb
View File

@ -144,8 +144,6 @@ describe 'neutron' do
is_expected.to contain_neutron_config('DEFAULT/global_physnet_mtu').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_config('DEFAULT/dhcp_agent_notification').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_config('DEFAULT/allow_bulk').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_config('DEFAULT/allow_pagination').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_config('DEFAULT/allow_sorting').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_config('DEFAULT/allow_overlapping_ips').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_config('DEFAULT/api_extensions_path').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_config('DEFAULT/control_exchange').with_value('neutron')