From fe70c9e80d3892f6235ab2ac4e0c2190498a37d5 Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Mon, 16 Oct 2017 11:46:25 -0400 Subject: [PATCH] Remove collector classes This code has been removed upstream[1] and the puppet module[2] has been updated accordingly. the heat templates [3] have been removed as well. [1] https://review.openstack.org/#/c/504244/ [2] https://review.openstack.org/512337 [3] https://review.openstack.org/#/c/509645/ Change-Id: I85ee06ff542c5d32ee08e987873d2db62130fb5f --- .../profile/base/ceilometer/collector.pp | 87 ----------- ..._profile_base_ceilometer_collector_spec.rb | 143 ------------------ 2 files changed, 230 deletions(-) delete mode 100644 manifests/profile/base/ceilometer/collector.pp delete mode 100644 spec/classes/tripleo_profile_base_ceilometer_collector_spec.rb diff --git a/manifests/profile/base/ceilometer/collector.pp b/manifests/profile/base/ceilometer/collector.pp deleted file mode 100644 index 9fcee7bf3..000000000 --- a/manifests/profile/base/ceilometer/collector.pp +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 2016 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# == Class: tripleo::profile::base::ceilometer::collector -# -# Ceilometer Collector profile for tripleo -# -# === Parameters -# -# [*bootstrap_node*] -# (Optional) The hostname of the node responsible for bootstrapping tasks -# Defaults to hiera('bootstrap_nodeid') -# -# [*step*] -# (Optional) The current step in deployment. See tripleo-heat-templates -# for more details. -# Defaults to hiera('step') -# -# [*ceilometer_backend*] -# (Optional) The ceilometer backend to use. -# Defaults to hiera('ceilometer_backend', 'mongodb') -# -# [*mongodb_ipv6*] -# (Optional) Flag to indicate if mongodb is using ipv6 -# Defaults to hiera('mongodb::server::ipv6', false) -# -# [*mongodb_node_ips*] -# (Optional) Array of mongodb node ip address. Required if backend is set -# to mongodb. -# Defaults to hiera('mongodb_node_ips', []) -# -# [*mongodb_replset*] -# (Optional) Replica set for mongodb. Required if backend is mongodb -# Defaults to hiera(''mongodb::server::replset', '') -# -class tripleo::profile::base::ceilometer::collector ( - $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = Integer(hiera('step')), - $ceilometer_backend = hiera('ceilometer_backend', 'mongodb'), - $mongodb_ipv6 = hiera('mongodb::server::ipv6', false), - $mongodb_node_ips = hiera('mongodb_node_ips', []), - $mongodb_replset = hiera('mongodb::server::replset', undef) -) { - if $::hostname == downcase($bootstrap_node) { - $sync_db = true - } else { - $sync_db = false - } - - include ::tripleo::profile::base::ceilometer - - if $step >= 4 or ($step >= 3 and $sync_db) { - if downcase($ceilometer_backend) == 'mongodb' { - if empty($mongodb_node_ips) { - fail('Provided mongodb node ip addresses are empty') - } - if !$mongodb_replset { - fail('mongodb_replset is required when using mongodb') - } - $mongo_nodes = suffix(any2array(normalize_ip_for_uri($mongodb_node_ips)), ':27017') - $mongo_node_string = join($mongo_nodes, ',') - $ceilometer_mongodb_conn_string = "mongodb://${mongo_node_string}/ceilometer?replicaSet=${mongodb_replset}" - - class { '::ceilometer::db' : - sync_db => $sync_db, - database_connection => $ceilometer_mongodb_conn_string, - } - } else { - class { '::ceilometer::db' : - sync_db => $sync_db, - } - } - include ::ceilometer::collector - include ::ceilometer::dispatcher::gnocchi - } -} diff --git a/spec/classes/tripleo_profile_base_ceilometer_collector_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_collector_spec.rb deleted file mode 100644 index 23b198a91..000000000 --- a/spec/classes/tripleo_profile_base_ceilometer_collector_spec.rb +++ /dev/null @@ -1,143 +0,0 @@ -# -# Copyright (C) 2016 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# - -require 'spec_helper' - -describe 'tripleo::profile::base::ceilometer::collector' do - shared_examples_for 'tripleo::profile::base::ceilometer::collector' do - let(:pre_condition) do - "class { '::tripleo::profile::base::ceilometer': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }" - end - - context 'with step 3 on bootstrap node with mongodb' do - let(:params) { { - :step => 3, - :bootstrap_node => 'node.example.com', - :mongodb_node_ips => ['127.0.0.1',], - :mongodb_replset => 'replicaset' - } } - - it 'should trigger complete configuration' do - is_expected.to contain_class('tripleo::profile::base::ceilometer::collector') - is_expected.to contain_class('ceilometer::db::sync') - is_expected.to contain_class('ceilometer::db').with( - :database_connection => 'mongodb://127.0.0.1:27017/ceilometer?replicaSet=replicaset' - ) - end - end - - context 'with step 3 on bootstrap node with mongodb with ipv6' do - let(:params) { { - :step => 3, - :bootstrap_node => 'node.example.com', - :mongodb_ipv6 => true, - :mongodb_node_ips => ['::1','fe80::ca5b:76ff:fe4b:be3b'], - :mongodb_replset => 'replicaset' - } } - - it 'should trigger complete configuration' do - is_expected.to contain_class('tripleo::profile::base::ceilometer::collector') - is_expected.to contain_class('ceilometer::db::sync') - is_expected.to contain_class('ceilometer::db').with( - :sync_db => true, - :database_connection => 'mongodb://[::1]:27017,[fe80::ca5b:76ff:fe4b:be3b]:27017/ceilometer?replicaSet=replicaset' - ) - end - end - - context 'with step 3 on bootstrap node without mongodb' do - let(:params) { { - :step => 3, - :bootstrap_node => 'node.example.com', - :ceilometer_backend => 'somethingelse', - :mongodb_node_ips => ['127.0.0.1',], - :mongodb_replset => 'replicaset' - } } - - it 'should trigger complete configuration' do - is_expected.to contain_class('tripleo::profile::base::ceilometer::collector') - is_expected.to contain_class('ceilometer::db::sync') - is_expected.to contain_class('ceilometer::db').without( - :database_connection => 'mongodb://127.0.0.1:27017/ceilometer?replicaSet=replicaset' - ) - is_expected.to contain_class('ceilometer::db').with( - :sync_db => true - ) - end - end - - context 'with step 3 not on bootstrap node' do - let(:params) { { - :step => 3, - :bootstrap_node => 'soemthingelse.example.com' - } } - - it 'should not trigger any configuration' do - is_expected.to contain_class('tripleo::profile::base::ceilometer::collector') - is_expected.to_not contain_class('ceilometer::db') - end - end - - context 'with step 4 on bootstrap node' do - let(:params) { { - :step => 4, - :bootstrap_node => 'node.example.com', - :mongodb_node_ips => ['127.0.0.1',], - :mongodb_replset => 'replicaset' - } } - - it 'should trigger complete configuration' do - is_expected.to contain_class('ceilometer::db::sync') - is_expected.to contain_class('ceilometer::db').with( - :sync_db => true, - :database_connection => 'mongodb://127.0.0.1:27017/ceilometer?replicaSet=replicaset' - ) - is_expected.to contain_class('ceilometer::collector') - is_expected.to contain_class('ceilometer::dispatcher::gnocchi') - end - end - - context 'with step 4 not on bootstrap node' do - let(:params) { { - :step => 4, - :bootstrap_node => 'somethingelse.example.com', - :mongodb_node_ips => ['127.0.0.1',], - :mongodb_replset => 'replicaset' - } } - - it 'should trigger complete configuration' do - is_expected.to_not contain_class('ceilometer::db::sync') - is_expected.to contain_class('ceilometer::db').with( - :sync_db => false, - :database_connection => 'mongodb://127.0.0.1:27017/ceilometer?replicaSet=replicaset' - ) - is_expected.to contain_class('ceilometer::collector') - is_expected.to contain_class('ceilometer::dispatcher::gnocchi') - end - end - end - - - on_supported_os.each do |os, facts| - context "on #{os}" do - let(:facts) do - facts.merge({ :hostname => 'node.example.com' }) - end - - it_behaves_like 'tripleo::profile::base::ceilometer::collector' - end - end -end