openstack
/
puppet-vitrage
Code Issues Proposed changes

Merge "Deprecate collector"

This commit is contained in:
Zuul 2018-12-14 04:27:15 +00:00 committed by Gerrit Code Review
parent 6475a8dd92 cb5973dc43
commit f89e9401b1
4 changed files with 9 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
manifests/collector.pp
View File

@ -1,5 +1,7 @@
# Installs the vitrage collector service
#
# DEPRECATED!
#
# == Params
# [*enabled*]
# (optional) Should the service be enabled.
@ -19,28 +21,5 @@ class vitrage::collector (
$package_ensure = 'present',
) {
include ::vitrage::deps
include ::vitrage::params
ensure_resource( 'package', [$::vitrage::params::collector_package_name],
{ ensure => $package_ensure,
tag => ['openstack', 'vitrage-package'] }
)
if $manage_service {
if $enabled {
$service_ensure = 'running'
} else {
$service_ensure = 'stopped'
}
}
service { 'vitrage-collector':
ensure => $service_ensure,
name => $::vitrage::params::collector_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'vitrage-service',
}
warning('vitrage::collector is deprecated, has no effect and will be removed in the T release')
}

4
manifests/params.pp
View File

@ -24,8 +24,6 @@ class vitrage::params {
$notifier_service_name = 'openstack-vitrage-notifier'
$graph_package_name = 'openstack-vitrage-graph'
$graph_service_name = 'openstack-vitrage-graph'
$collector_package_name = 'openstack-vitrage-collector'
$collector_service_name = 'openstack-vitrage-collector'
$persistor_package_name = 'openstack-vitrage-persistor'
$persistor_service_name = 'openstack-vitrage-persistor'
$vitrage_wsgi_script_path = '/var/www/cgi-bin/vitrage'
@ -39,8 +37,6 @@ class vitrage::params {
$notifier_service_name = 'vitrage-notifier'
$graph_package_name = 'vitrage-graph'
$graph_service_name = 'vitrage-graph'
$collector_package_name = 'vitrage-collector'
$collector_service_name = 'vitrage-collector'
$persistor_package_name = 'vitrage-persistor'
$persistor_service_name = 'vitrage-persistor'
$vitrage_wsgi_script_path = '/usr/lib/cgi-bin/vitrage'

6
releasenotes/notes/deprecate-collector-c03cf7172381a025.yaml Normal file
View File

@ -0,0 +1,6 @@
---
deprecations:
- |
The vitrage::collector class is now deprecated and will be removed in the
Train release. This resource no longer does anything since the collector
service doesn't exist anymore.

94
spec/classes/vitrage_collector_spec.rb
View File

@ -1,94 +0,0 @@
require 'spec_helper'
describe 'vitrage::collector' do
let :pre_condition do
"class { '::vitrage': }"
end
shared_examples_for 'vitrage-collector' do
context 'when enabled' do
it { is_expected.to contain_class('vitrage::deps') }
it { is_expected.to contain_class('vitrage::params') }
it 'installs vitrage-collector package' do
is_expected.to contain_package(platform_params[:collector_package_name]).with(
:ensure => 'present',
:tag => ['openstack', 'vitrage-package']
)
end
it 'configures vitrage-collector service' do
is_expected.to contain_service('vitrage-collector').with(
:ensure => 'running',
:name => platform_params[:collector_service_name],
:enable => true,
:hasstatus => true,
:hasrestart => true,
:tag => 'vitrage-service',
)
end
end
context 'when disabled' do
let :params do
{ :enabled => false }
end
it { is_expected.to compile }
it 'configures vitrage-collector service' do
is_expected.to contain_service('vitrage-collector').with(
:ensure => 'stopped',
:name => platform_params[:collector_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true,
:tag => 'vitrage-service',
)
end
end
context 'when service management is disabled' do
let :params do
{ :enabled => false,
:manage_service => false }
end
it 'configures vitrage-collector service' do
is_expected.to contain_service('vitrage-collector').with(
:ensure => nil,
:name => platform_params[:collector_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true,
:tag => 'vitrage-service',
)
end
end
end
on_supported_os({
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
end
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
{ :collector_package_name => 'vitrage-collector',
:collector_service_name => 'vitrage-collector' }
when 'RedHat'
{ :collector_package_name => 'openstack-vitrage-collector',
:collector_service_name => 'openstack-vitrage-collector' }
end
end
it_configures 'vitrage-collector'
end
end
end