Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
Disable notification from services by default
Browse files Browse the repository at this point in the history
Currently we disable Telemetry services like Ceilometer by defaut,
which means that we don't have any consumers for notification messages.
So NotificationDriver should be set as noop by default so that we don't
have unconsumed messages in notification queues.

Change-Id: I1d05749c94bd58ad4badafa7d9755009cb4b64af
Closes-Bug: #1869355
(cherry picked from commit afc0b73)
(cherry picked from commit 7ab640c)
  • Loading branch information
kajinamit authored and mrunge committed Jan 20, 2021
1 parent 2591c1c commit 491b545
Show file tree
Hide file tree
Showing 23 changed files with 32 additions and 15 deletions.
1 change: 1 addition & 0 deletions ci/environments/scenario001-multinode-containers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ parameter_defaults:
ceilometer::agent::polling::polling_interval: 15
# NOTE(mmagr): uncomment when QDR mesh will actually work (followup on review.opendev.org/702754)
#tripleo::profile::base::metrics::qdr::router_mode: interior
NotificationDriver: 'messagingv2'
ManagePolling: true
ManagePipeline: true
CeilometerEnableGnocchi: true
Expand Down
2 changes: 1 addition & 1 deletion ci/environments/scenario001-standalone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ parameter_defaults:
# in sync with the archive policy, 60s too.
ceilometer::agent::polling::polling_interval: 15
tripleo::profile::base::metrics::qdr::interior_mesh_nodes: ''
NotificationDriver: 'messagingv2'
ManagePolling: true
HeatConfigureDelegatedRoles: true
ManagePipeline: true
CeilometerEnableGnocchi: true
PipelinePublishers:
- gnocchi://?archive_policy=ceilometer-high-rate
Expand Down
1 change: 1 addition & 0 deletions ci/environments/scenario002-standalone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ parameter_defaults:
# instead of 10 minutes. Note that tempest telemetry.alarm_granularity must
# in sync with the archive policy, 60s too.
ceilometer::agent::polling::polling_interval: 15
NotificationDriver: 'messagingv2'
ManagePolling: true
ManagePipeline: true
CeilometerEnableGnocchi: true
Expand Down
2 changes: 1 addition & 1 deletion deployment/aodh/aodh-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ parameters:
description: Keystone region for endpoint
NotificationDriver:
type: string
default: 'messagingv2'
default: 'noop'
description: Driver or drivers to handle sending notifications.

conditions:
Expand Down
2 changes: 1 addition & 1 deletion deployment/barbican/barbican-api-container-puppet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ parameters:
type: json
NotificationDriver:
type: string
default: 'messagingv2'
default: 'noop'
description: Driver or drivers to handle sending notifications.
DeployIdentifier:
default: ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ parameters:
hidden: true
NotificationDriver:
type: string
default: 'messagingv2'
default: 'noop'
description: Driver or drivers to handle sending notifications.
GnocchiArchivePolicy:
default: 'ceilometer-low-rate'
Expand Down
2 changes: 1 addition & 1 deletion deployment/cinder/cinder-api-container-puppet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ parameters:
type: json
NotificationDriver:
type: string
default: 'messagingv2'
default: 'noop'
description: Driver or drivers to handle sending notifications.
RootStackName:
description: The name of the stack/plan.
Expand Down
2 changes: 1 addition & 1 deletion deployment/experimental/designate/designate-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ parameters:
type: number
NotificationDriver:
type: string
default: 'messagingv2'
default: 'noop'
description: Driver or drivers to handle sending notifications.

parameter_groups:
Expand Down
2 changes: 1 addition & 1 deletion deployment/glance/glance-api-container-puppet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ parameters:
type: json
NotificationDriver:
type: string
default: 'messagingv2'
default: 'noop'
description: Driver or drivers to handle sending notifications.
EnableInternalTLS:
type: boolean
Expand Down
2 changes: 1 addition & 1 deletion deployment/heat/heat-base-puppet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ parameters:
type: number
NotificationDriver:
type: string
default: 'messagingv2'
default: 'noop'
description: Driver or drivers to handle sending notifications.
HeatCorsAllowedOrigin:
type: string
Expand Down
2 changes: 1 addition & 1 deletion deployment/keystone/keystone-container-puppet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ parameters:
hidden: true
NotificationDriver:
type: string
default: 'messagingv2'
default: 'noop'
description: Driver or drivers to handle sending notifications.
KeystoneChangePasswordUponFirstUse:
type: string
Expand Down
2 changes: 1 addition & 1 deletion deployment/manila/manila-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ parameters:
hidden: true
NotificationDriver:
type: string
default: 'messagingv2'
default: 'noop'
description: Driver or drivers to handle sending notifications.

conditions:
Expand Down
2 changes: 1 addition & 1 deletion deployment/mistral/mistral-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ parameters:
hidden: true
NotificationDriver:
type: string
default: 'messagingv2'
default: 'noop'
description: Driver or drivers to handle sending notifications.

conditions:
Expand Down
2 changes: 1 addition & 1 deletion deployment/neutron/neutron-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ parameters:
type: json
NotificationDriver:
type: string
default: 'messagingv2'
default: 'noop'
description: Driver or drivers to handle sending notifications.
EnableVLANTransparency:
default: false
Expand Down
2 changes: 1 addition & 1 deletion deployment/nova/nova-base-puppet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ parameters:
description: Keystone region for endpoint
NotificationDriver:
type: string
default: 'messagingv2'
default: 'noop'
description: Driver or drivers to handle sending notifications.
NovaPassword:
description: The password for the nova service and db account
Expand Down
2 changes: 1 addition & 1 deletion deployment/octavia/octavia-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ parameters:
configuration remnants after upgrades.
NotificationDriver:
type: string
default: 'messagingv2'
default: 'noop'
description: Driver or drivers to handle sending notifications.
OctaviaUserName:
description: The username for the Octavia database and keystone accounts.
Expand Down
2 changes: 1 addition & 1 deletion deployment/sahara/sahara-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ parameters:
type: comma_delimited_list
NotificationDriver:
type: string
default: 'messagingv2'
default: 'noop'
description: Driver or drivers to handle sending notifications.
NtpServer:
default: ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org']
Expand Down
1 change: 1 addition & 0 deletions environments/enable-legacy-telemetry.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ resource_registry:
OS::TripleO::Services::Logging::PankoApi: ../deployment/logging/files/panko-api.yaml

parameter_defaults:
NotificationDriver: 'messagingv2'
# uncomment the next two lines when using ceph
# GnocchiRbdPoolName: 'metrics'
# GnocchiBackend: 'rbd'
Expand Down
1 change: 1 addition & 0 deletions environments/enable-stf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ resource_registry:
OS::TripleO::Services::ComputeCeilometerAgent: ../deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml

parameter_defaults:
NotificationDriver: 'messagingv2'
CeilometerQdrPublishEvents: true
CeilometerQdrPublishMetrics: true
EnableSTF: true
Expand Down
1 change: 1 addition & 0 deletions environments/metrics/ceilometer-write-qdr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ parameter_defaults:
CeilometerEnablePanko: false
CeilometerQdrPublishEvents: true
CeilometerQdrPublisMetrics: true
NotificationDriver: 'messagingv2'
3 changes: 3 additions & 0 deletions environments/services-baremetal/undercloud-ceilometer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ resource_registry:
OS::TripleO::Services::UndercloudCeilometerAgentCentral: ../../deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
OS::TripleO::Services::UndercloudCeilometerAgentNotification: ../../deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
OS::TripleO::Services::UndercloudCeilometerAgentIpmi: ../../deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml

parameter_defaults:
NotificationDriver: 'messagingv2'
3 changes: 3 additions & 0 deletions environments/services/undercloud-ceilometer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ resource_registry:
OS::TripleO::Services::CeilometerAgentCentral: ../../deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
OS::TripleO::Services::CeilometerAgentNotification: ../../deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
OS::TripleO::Services::CeilometerAgentIpmi: ../../deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml

parameter_defaults:
NotificationDriver: 'messagingv2'
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
upgrade:
- |
Now NotificationDriver is set to noop by default, as legacy telemetry
services are disabled by default. Explicitly set NotificationDriver
parameter to notifications from each services.

0 comments on commit 491b545

Please sign in to comment.