openstack
/
puppet-neutron
Code Issues Proposed changes

Deprecate memcache_servers 

The parameter memcache_servers was used to configure
DEFAULT/memcached_servers in neutron.conf.

Neutron does not have this option anymore [0],
let's deprecate it.

[0] http://paste.openstack.org/show/585381/

Change-Id: I05e11007030ecff1bbd0b1f1a42e9e098bcced23
This commit is contained in:
Iury Gregory Melo Ferreira 2016-10-11 16:03:24 -03:00
parent 3a456e1de1
commit 38f6a3eaf4
3 changed files with 10 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/init.pp
View File

@ -110,10 +110,6 @@
# report_interval is a config for neutron agents, set by class neutron
# Defaults to: $::os_service_default
#
# [*memcache_servers*]
# List of memcache servers in format of server:port.
# Optional. Defaults to false. Example: ['localhost:11211']
#
# [*control_exchange*]
# (optional) What RPC queue/exchange to use
# Defaults to neutron
@ -380,6 +376,9 @@
# (optional) Enable pagination
# Defaults to undef
#
# [*memcache_servers*]
# (optional) This option is deprecated an has no effect.
#
class neutron (
$enabled = true,
$package_ensure = 'present',
@ -403,7 +402,6 @@ class neutron (
$root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
$root_helper_daemon = $::os_service_default,
$report_interval = $::os_service_default,
$memcache_servers = false,
$control_exchange = 'neutron',
$default_transport_url = $::os_service_default,
$rpc_backend = $::os_service_default,
@ -465,6 +463,7 @@ class neutron (
$advertise_mtu = undef,
$allow_pagination = undef,
$allow_sorting = undef,
$memcache_servers = undef,
) {
include ::neutron::deps
@ -518,7 +517,7 @@ class neutron (
}
if $memcache_servers {
validate_array($memcache_servers)
warning('memcache_servers option is deprecated, has no effect and will be removed after Ocata.')
}
package { 'neutron':
@ -575,17 +574,6 @@ class neutron (
}
}
if $memcache_servers {
neutron_config {
'DEFAULT/memcached_servers': value => join($memcache_servers, ',');
}
} else {
neutron_config {
'DEFAULT/memcached_servers': ensure => absent;
}
}
if $rpc_backend in [$::os_service_default, 'neutron.openstack.common.rpc.impl_kombu', 'rabbit'] {
if is_service_default($rabbit_password) {
fail('When rpc_backend is rabbitmq, you must set rabbit password')

5
releasenotes/notes/deprecate_memcache_servers_param-fa8ca364a0e58da7.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- Deprecate the memcache_servers parameter in init.pp since
Neutron does not have the memcached_servers configuration
in the DEFAULT section in neutron.conf

19
spec/classes/neutron_init_spec.rb
View File

@ -87,8 +87,6 @@ describe 'neutron' do
it_configures 'with log_file specified'
it_configures 'without service_plugins'
it_configures 'with service_plugins'
it_configures 'without memcache_servers'
it_configures 'with memcache_servers'
it_configures 'with host defined'
it_configures 'with dns_domain defined'
it_configures 'with transport_url defined'
@ -422,23 +420,6 @@ describe 'neutron' do
end
shared_examples_for 'without memcache_servers' do
it { is_expected.to contain_neutron_config('DEFAULT/memcached_servers').with_ensure('absent') }
end
shared_examples_for 'with memcache_servers' do
before do
params.merge!(
:memcache_servers => ['memcache1','memcache2','memcache3']
)
end
it do
is_expected.to contain_neutron_config('DEFAULT/memcached_servers').with_value('memcache1,memcache2,memcache3')
end
end
shared_examples_for 'with global_physnet_mtu defined' do
before do
params.merge!(