openstack
/
puppet-ceilometer
Code Issues Proposed changes

Revert "deprecate dispatcher::gnocchi::archive_policy" 

The upstream change has been reverted so lets revert this as well. See I4ee646088f7bc370ed7ffd1eb3b98e66bae6782e 

This reverts commit 1a4bdd359d.

Change-Id: I017e8b4f7a064bc6cd3c283d1c115f3ecf1499fe
This commit is contained in:
Pradeep Kilambi 2017-08-23 14:51:17 +00:00
parent 1a4bdd359d
commit c9174849f9
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/dispatcher/gnocchi.pp
View File

@ -13,6 +13,10 @@
# generated by Gnocchi service activity
# Defaults to $::os_service_default.
#
# [*archive_policy*]
# (Optional) The archive policy to use when the dispatcher
# Defaults to $::os_service_default.
#
# [*resources_definition_file*]
# (Optional) The Yaml file that defines mapping between samples
# and gnocchi resources/metrics.
@ -24,26 +28,18 @@
# (Optional) Gnocchi URL
# Defaults to undef
#
# [*archive_policy*]
# (Optional) The archive policy to use when the dispatcher
# Defaults to undef
#
#
class ceilometer::dispatcher::gnocchi (
$filter_service_activity = $::os_service_default,
$filter_project = $::os_service_default,
$archive_policy = $::os_service_default,
$resources_definition_file = $::os_service_default,
# DEPRECATED PARAMETERS
$url = undef,
$archive_policy = undef,
) {
include ::ceilometer::deps
if $archive_policy {
warning('archive_policy parameter is deprecated, has no effect and will be removed in the Q release.')
}
if $url {
warning('url parameter is deprecated, has no effect and will be removed in the Q release.')
}
@ -51,6 +47,7 @@ class ceilometer::dispatcher::gnocchi (
ceilometer_config {
'dispatcher_gnocchi/filter_service_activity': value => $filter_service_activity;
'dispatcher_gnocchi/filter_project': value => $filter_project;
'dispatcher_gnocchi/archive_policy': value => $archive_policy;
'dispatcher_gnocchi/resources_definition_file': value => $resources_definition_file;
}

4
releasenotes/notes/gnocchi-dispatcher-archive-policy-a5b4101fe7c33532.yaml
View File

@ -1,4 +0,0 @@
---
deprecations:
- archive_policy option of ceilometer::dispatcher::gnocchi is now deprecated
for removal, the parameter has no effect.

3
spec/classes/ceilometer_dispatcher_gnocchi_spec.rb
View File

@ -14,6 +14,7 @@ describe 'ceilometer::dispatcher::gnocchi' do
it 'configures gnocchi dispatcher' do
is_expected.to contain_ceilometer_config('dispatcher_gnocchi/filter_service_activity').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ceilometer_config('dispatcher_gnocchi/filter_project').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ceilometer_config('dispatcher_gnocchi/archive_policy').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ceilometer_config('dispatcher_gnocchi/resources_definition_file').with_value('<SERVICE DEFAULT>')
end
@ -21,10 +22,12 @@ describe 'ceilometer::dispatcher::gnocchi' do
before do
params.merge!(:filter_service_activity => false,
:filter_project => 'gnocchi_swift',
:archive_policy => 'high',
:resources_definition_file => 'foo')
end
it { is_expected.to contain_ceilometer_config('dispatcher_gnocchi/filter_service_activity').with_value('false') }
it { is_expected.to contain_ceilometer_config('dispatcher_gnocchi/filter_project').with_value('gnocchi_swift') }
it { is_expected.to contain_ceilometer_config('dispatcher_gnocchi/archive_policy').with_value('high') }
it { is_expected.to contain_ceilometer_config('dispatcher_gnocchi/resources_definition_file').with_value('foo') }
end
end