openstack
/
puppet-ceilometer
Code Issues Proposed changes

Enable support for memcached_servers 

Closes-Bug #1469652

Change-Id: I955899f37d5337634d1a33712850f7c16b77113b
This commit is contained in:
Matt Fischer 2015-07-08 20:43:56 -06:00
parent dcc71c619c
commit cf846dc532
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/init.pp
View File

@ -74,6 +74,9 @@
# Valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be
# available on some distributions.
# Defaults to 'TLSv1'
# [*memcached_servers*]
# (optional) A list of memcached server(s) to use for caching.
# Defaults to undef
#
# [*qpid_hostname*]
# [*qpid_port*]
@ -113,6 +116,7 @@ class ceilometer(
$kombu_ssl_certfile = undef,
$kombu_ssl_keyfile = undef,
$kombu_ssl_version = 'TLSv1',
$memcached_servers = undef,
$qpid_hostname = 'localhost',
$qpid_port = 5672,
$qpid_username = 'guest',
@ -304,4 +308,17 @@ class ceilometer(
}
}
if $memcached_servers {
validate_array($memcached_servers)
}
if $memcached_servers {
ceilometer_config {
'DEFAULT/memcached_servers': value => join($memcached_servers, ',')
}
} else {
ceilometer_config {
'DEFAULT/memcached_servers': ensure => absent;
}
}
}

10
spec/classes/ceilometer_init_spec.rb
View File

@ -331,6 +331,16 @@ describe 'ceilometer' do
end
end
shared_examples_for 'memcached support' do
context "with memcached enabled" do
before { params.merge!(
:memcached_servers => ['1.2.3.4','1.2.3.5']
) }
it { is_expected.to contain_ceilometer_config('DEFAULT/memcached_servers').with_value('1.2.3.4,1.2.3.5') }
end
end
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian' }