openstack/puppet-neutron
Code Issues Proposed changes

Add memcached_servers for keystone authtoken

Browse Source 
This change allows a user to manage the memcached servers for
keystone_authtoken.

Change-Id: Ic3963631caab327c1f44819be9eb14d0173085a2
This commit is contained in:
Alex Schultz 2016-06-30 09:44:40 -06:00
parent 4cbf6d1cba
commit fd675a550a
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/server.pp
View File

@ -72,6 +72,11 @@
# (optional) Connection url for the neutron database.
# (Defaults to undef)
#
# [*memcached_servers*]
# (optinal) a list of memcached server(s) to use for caching. If left
# undefined, tokens will instead be cached in-process.
# Defaults to $::os_service_default.
#
# [*sql_connection*]
# DEPRECATED: Use database_connection instead.
#
@ -355,6 +360,7 @@ class neutron::server (
$ensure_fwaas_package = false,
$vpnaas_agent_package = false,
$service_providers = $::os_service_default,
$memcached_servers = $::os_service_default,
# DEPRECATED PARAMETERS
$log_dir = undef,
$log_file = undef,
@ -514,6 +520,10 @@ class neutron::server (
}
}
neutron_config {
'keystone_authtoken/memcached_servers': value => join(any2array($memcached_servers), ',');
}
if $auth_password {
warning('identity_uri, auth_tenant, auth_user, auth_password, auth_region configuration options are deprecated in favor of auth_plugin and related options')

4
releasenotes/notes/keystone-authtoken-memcached-cf70cebad8b21492.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- Adds the ability to manage the memcached servers for
keystone_authtoken in neutron::server

18
spec/classes/neutron_server_spec.rb
View File

@ -63,6 +63,7 @@ describe 'neutron::server' do
is_expected.to contain_neutron_config('keystone_authtoken/admin_user').with_ensure('absent');
is_expected.to contain_neutron_config('keystone_authtoken/admin_password').with_ensure('absent');
is_expected.to contain_neutron_config('keystone_authtoken/identity_uri').with_ensure('absent');
is_expected.to contain_neutron_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>');
end
it 'installs neutron server package' do
@ -356,6 +357,23 @@ describe 'neutron::server' do
end
end
describe "with keystoneauth memcache servers" do
let :facts do
@default_facts.merge(test_facts.merge({
:osfamily => 'RedHat',
:operatingsystemrelease => '7'
}))
end
before do
params.merge!({
:memcached_servers => '1.1.1.1:11211'
})
end
it 'configures keystone authentication memached servers' do
is_expected.to contain_neutron_config('keystone_authtoken/memcached_servers').with_value('1.1.1.1:11211');
end
end
describe "with custom auth region" do
let :facts do
@default_facts.merge(test_facts.merge({