From 8abf437ed277cc55c52a1daf9d01953dffb8b94c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 26 Apr 2022 11:34:46 +0900 Subject: [PATCH] Remove unused implementation to trigger ceilometer-upgrade Currently the ceilometer-upgrade command is executed not by puppet, but by the the indepdndent ceilometer_gnocchi_upgrade container. Change-Id: I1886d96d558af4d7cf46ef59f7c0c7871a697581 --- .../base/ceilometer/agent/notification.pp | 1 - .../profile/base/ceilometer/agent/polling.pp | 4 -- manifests/profile/base/ceilometer/upgrade.pp | 62 ------------------- ...base_ceilometer_agent_notification_spec.rb | 2 - 4 files changed, 69 deletions(-) delete mode 100644 manifests/profile/base/ceilometer/upgrade.pp diff --git a/manifests/profile/base/ceilometer/agent/notification.pp b/manifests/profile/base/ceilometer/agent/notification.pp index 404089491..8e0cb3c1f 100644 --- a/manifests/profile/base/ceilometer/agent/notification.pp +++ b/manifests/profile/base/ceilometer/agent/notification.pp @@ -66,7 +66,6 @@ class tripleo::profile::base::ceilometer::agent::notification ( $event_pipeline_publishers = undef, ) { include tripleo::profile::base::ceilometer - include tripleo::profile::base::ceilometer::upgrade if $step >= 4 { include ceilometer::agent::service_credentials diff --git a/manifests/profile/base/ceilometer/agent/polling.pp b/manifests/profile/base/ceilometer/agent/polling.pp index 550ef8bb3..84e0df6af 100644 --- a/manifests/profile/base/ceilometer/agent/polling.pp +++ b/manifests/profile/base/ceilometer/agent/polling.pp @@ -56,10 +56,6 @@ class tripleo::profile::base::ceilometer::agent::polling ( ) { include tripleo::profile::base::ceilometer - if $central_namespace { - include tripleo::profile::base::ceilometer::upgrade - } - if $enable_internal_tls { $tls_query_param = '?ssl=true' } else { diff --git a/manifests/profile/base/ceilometer/upgrade.pp b/manifests/profile/base/ceilometer/upgrade.pp deleted file mode 100644 index f5b1ed042..000000000 --- a/manifests/profile/base/ceilometer/upgrade.pp +++ /dev/null @@ -1,62 +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::upgrade -# -# Ceilometer upgrade profile for tripleo -# -# === Parameters -# -# [*bootstrap_node*] -# (Optional) The hostname of the node responsible for bootstrapping tasks -# Defaults to hiera('gnocchi_api_short_bootstrap_node_name') -# -# [*step*] -# (Optional) The current step in deployment. See tripleo-heat-templates -# for more details. -# Defaults to hiera('step') -# - -class tripleo::profile::base::ceilometer::upgrade ( - $bootstrap_node = hiera('gnocchi_api_short_bootstrap_node_name', undef), - $step = Integer(hiera('step')), -) { - if $bootstrap_node and $::hostname == downcase($bootstrap_node) { - $sync_db = true - } else { - $sync_db = false - } - - if $step >= 5 and $sync_db { - exec {'ceilometer-db-upgrade': - command => 'ceilometer-upgrade', - path => ['/usr/bin', '/usr/sbin'], - # LP#1703444 - When this runs, it talks to gnocchi on all controllers - # which then reaches out to keystone via haproxy. Since the deployment - # may restart httpd on these other nodes it can result in an intermittent - # 503 which fails this command. We should retry the upgrade in case of - # error since we cannot ensure that there might not be some other deploy - # process running on the other nodes. - try_sleep => 5, - tries => 10 - } - - # NOTE(sileht): Ensure we run before ceilometer-agent-notification is - # started and after gnocchi-api is running - include gnocchi::deps - Anchor['gnocchi::service::end'] - ~> Exec['ceilometer-db-upgrade'] - ~> Anchor['ceilometer::service::begin'] - } -} diff --git a/spec/classes/tripleo_profile_base_ceilometer_agent_notification_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_agent_notification_spec.rb index 1b05bf462..b62c0f276 100644 --- a/spec/classes/tripleo_profile_base_ceilometer_agent_notification_spec.rb +++ b/spec/classes/tripleo_profile_base_ceilometer_agent_notification_spec.rb @@ -29,7 +29,6 @@ describe 'tripleo::profile::base::ceilometer::agent::notification' do it 'should do nothing' do is_expected.to contain_class('tripleo::profile::base::ceilometer::agent::notification') - is_expected.to contain_class('tripleo::profile::base::ceilometer::upgrade') is_expected.to_not contain_class('ceilometer::agent::service_credentials') is_expected.to_not contain_class('ceilometer::agent::notification') end @@ -46,7 +45,6 @@ describe 'tripleo::profile::base::ceilometer::agent::notification' do it 'should trigger complete configuration' do is_expected.to contain_class('tripleo::profile::base::ceilometer::agent::notification') - is_expected.to contain_class('tripleo::profile::base::ceilometer::upgrade') is_expected.to contain_class('ceilometer::agent::service_credentials') is_expected.to contain_class('ceilometer::agent::notification').with( :event_pipeline_publishers => ["notifier://127.0.0.1:5666/?driver=amqp&topic=ceilometer/event.sample"],