Disable notification from services by default

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 afc0b731e0)
(cherry picked from commit 7ab640cfa5)
This commit is contained in:
Takashi Kajinami 2020-03-27 20:00:48 +09:00 committed by Matthias Runge
parent 2591c1c25b
commit 491b545715
23 changed files with 32 additions and 15 deletions

View File

@ -105,6 +105,7 @@ parameter_defaults:
ceilometer::agent::polling::polling_interval: 15 ceilometer::agent::polling::polling_interval: 15
# NOTE(mmagr): uncomment when QDR mesh will actually work (followup on review.opendev.org/702754) # NOTE(mmagr): uncomment when QDR mesh will actually work (followup on review.opendev.org/702754)
#tripleo::profile::base::metrics::qdr::router_mode: interior #tripleo::profile::base::metrics::qdr::router_mode: interior
NotificationDriver: 'messagingv2'
ManagePolling: true ManagePolling: true
ManagePipeline: true ManagePipeline: true
CeilometerEnableGnocchi: true CeilometerEnableGnocchi: true

View File

@ -43,9 +43,9 @@ parameter_defaults:
# in sync with the archive policy, 60s too. # in sync with the archive policy, 60s too.
ceilometer::agent::polling::polling_interval: 15 ceilometer::agent::polling::polling_interval: 15
tripleo::profile::base::metrics::qdr::interior_mesh_nodes: '' tripleo::profile::base::metrics::qdr::interior_mesh_nodes: ''
NotificationDriver: 'messagingv2'
ManagePolling: true ManagePolling: true
HeatConfigureDelegatedRoles: true HeatConfigureDelegatedRoles: true
ManagePipeline: true
CeilometerEnableGnocchi: true CeilometerEnableGnocchi: true
PipelinePublishers: PipelinePublishers:
- gnocchi://?archive_policy=ceilometer-high-rate - gnocchi://?archive_policy=ceilometer-high-rate

View File

@ -33,6 +33,7 @@ parameter_defaults:
# instead of 10 minutes. Note that tempest telemetry.alarm_granularity must # instead of 10 minutes. Note that tempest telemetry.alarm_granularity must
# in sync with the archive policy, 60s too. # in sync with the archive policy, 60s too.
ceilometer::agent::polling::polling_interval: 15 ceilometer::agent::polling::polling_interval: 15
NotificationDriver: 'messagingv2'
ManagePolling: true ManagePolling: true
ManagePipeline: true ManagePipeline: true
CeilometerEnableGnocchi: true CeilometerEnableGnocchi: true

View File

@ -54,7 +54,7 @@ parameters:
description: Keystone region for endpoint description: Keystone region for endpoint
NotificationDriver: NotificationDriver:
type: string type: string
default: 'messagingv2' default: 'noop'
description: Driver or drivers to handle sending notifications. description: Driver or drivers to handle sending notifications.
conditions: conditions:

View File

@ -156,7 +156,7 @@ parameters:
type: json type: json
NotificationDriver: NotificationDriver:
type: string type: string
default: 'messagingv2' default: 'noop'
description: Driver or drivers to handle sending notifications. description: Driver or drivers to handle sending notifications.
DeployIdentifier: DeployIdentifier:
default: '' default: ''

View File

@ -74,7 +74,7 @@ parameters:
hidden: true hidden: true
NotificationDriver: NotificationDriver:
type: string type: string
default: 'messagingv2' default: 'noop'
description: Driver or drivers to handle sending notifications. description: Driver or drivers to handle sending notifications.
GnocchiArchivePolicy: GnocchiArchivePolicy:
default: 'ceilometer-low-rate' default: 'ceilometer-low-rate'

View File

@ -86,7 +86,7 @@ parameters:
type: json type: json
NotificationDriver: NotificationDriver:
type: string type: string
default: 'messagingv2' default: 'noop'
description: Driver or drivers to handle sending notifications. description: Driver or drivers to handle sending notifications.
RootStackName: RootStackName:
description: The name of the stack/plan. description: The name of the stack/plan.

View File

@ -64,7 +64,7 @@ parameters:
type: number type: number
NotificationDriver: NotificationDriver:
type: string type: string
default: 'messagingv2' default: 'noop'
description: Driver or drivers to handle sending notifications. description: Driver or drivers to handle sending notifications.
parameter_groups: parameter_groups:

View File

@ -194,7 +194,7 @@ parameters:
type: json type: json
NotificationDriver: NotificationDriver:
type: string type: string
default: 'messagingv2' default: 'noop'
description: Driver or drivers to handle sending notifications. description: Driver or drivers to handle sending notifications.
EnableInternalTLS: EnableInternalTLS:
type: boolean type: boolean

View File

@ -121,7 +121,7 @@ parameters:
type: number type: number
NotificationDriver: NotificationDriver:
type: string type: string
default: 'messagingv2' default: 'noop'
description: Driver or drivers to handle sending notifications. description: Driver or drivers to handle sending notifications.
HeatCorsAllowedOrigin: HeatCorsAllowedOrigin:
type: string type: string

View File

@ -176,7 +176,7 @@ parameters:
hidden: true hidden: true
NotificationDriver: NotificationDriver:
type: string type: string
default: 'messagingv2' default: 'noop'
description: Driver or drivers to handle sending notifications. description: Driver or drivers to handle sending notifications.
KeystoneChangePasswordUponFirstUse: KeystoneChangePasswordUponFirstUse:
type: string type: string

View File

@ -50,7 +50,7 @@ parameters:
hidden: true hidden: true
NotificationDriver: NotificationDriver:
type: string type: string
default: 'messagingv2' default: 'noop'
description: Driver or drivers to handle sending notifications. description: Driver or drivers to handle sending notifications.
conditions: conditions:

View File

@ -47,7 +47,7 @@ parameters:
hidden: true hidden: true
NotificationDriver: NotificationDriver:
type: string type: string
default: 'messagingv2' default: 'noop'
description: Driver or drivers to handle sending notifications. description: Driver or drivers to handle sending notifications.
conditions: conditions:

View File

@ -103,7 +103,7 @@ parameters:
type: json type: json
NotificationDriver: NotificationDriver:
type: string type: string
default: 'messagingv2' default: 'noop'
description: Driver or drivers to handle sending notifications. description: Driver or drivers to handle sending notifications.
EnableVLANTransparency: EnableVLANTransparency:
default: false default: false

View File

@ -36,7 +36,7 @@ parameters:
description: Keystone region for endpoint description: Keystone region for endpoint
NotificationDriver: NotificationDriver:
type: string type: string
default: 'messagingv2' default: 'noop'
description: Driver or drivers to handle sending notifications. description: Driver or drivers to handle sending notifications.
NovaPassword: NovaPassword:
description: The password for the nova service and db account description: The password for the nova service and db account

View File

@ -48,7 +48,7 @@ parameters:
configuration remnants after upgrades. configuration remnants after upgrades.
NotificationDriver: NotificationDriver:
type: string type: string
default: 'messagingv2' default: 'noop'
description: Driver or drivers to handle sending notifications. description: Driver or drivers to handle sending notifications.
OctaviaUserName: OctaviaUserName:
description: The username for the Octavia database and keystone accounts. description: The username for the Octavia database and keystone accounts.

View File

@ -50,7 +50,7 @@ parameters:
type: comma_delimited_list type: comma_delimited_list
NotificationDriver: NotificationDriver:
type: string type: string
default: 'messagingv2' default: 'noop'
description: Driver or drivers to handle sending notifications. description: Driver or drivers to handle sending notifications.
NtpServer: NtpServer:
default: ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org'] default: ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org']

View File

@ -17,6 +17,7 @@ resource_registry:
OS::TripleO::Services::Logging::PankoApi: ../deployment/logging/files/panko-api.yaml OS::TripleO::Services::Logging::PankoApi: ../deployment/logging/files/panko-api.yaml
parameter_defaults: parameter_defaults:
NotificationDriver: 'messagingv2'
# uncomment the next two lines when using ceph # uncomment the next two lines when using ceph
# GnocchiRbdPoolName: 'metrics' # GnocchiRbdPoolName: 'metrics'
# GnocchiBackend: 'rbd' # GnocchiBackend: 'rbd'

View File

@ -8,6 +8,7 @@ resource_registry:
OS::TripleO::Services::ComputeCeilometerAgent: ../deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml OS::TripleO::Services::ComputeCeilometerAgent: ../deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
parameter_defaults: parameter_defaults:
NotificationDriver: 'messagingv2'
CeilometerQdrPublishEvents: true CeilometerQdrPublishEvents: true
CeilometerQdrPublishMetrics: true CeilometerQdrPublishMetrics: true
EnableSTF: true EnableSTF: true

View File

@ -12,3 +12,4 @@ parameter_defaults:
CeilometerEnablePanko: false CeilometerEnablePanko: false
CeilometerQdrPublishEvents: true CeilometerQdrPublishEvents: true
CeilometerQdrPublisMetrics: true CeilometerQdrPublisMetrics: true
NotificationDriver: 'messagingv2'

View File

@ -3,3 +3,6 @@ resource_registry:
OS::TripleO::Services::UndercloudCeilometerAgentCentral: ../../deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml 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::UndercloudCeilometerAgentNotification: ../../deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
OS::TripleO::Services::UndercloudCeilometerAgentIpmi: ../../deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml OS::TripleO::Services::UndercloudCeilometerAgentIpmi: ../../deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
parameter_defaults:
NotificationDriver: 'messagingv2'

View File

@ -4,3 +4,6 @@ resource_registry:
OS::TripleO::Services::CeilometerAgentCentral: ../../deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml 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::CeilometerAgentNotification: ../../deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
OS::TripleO::Services::CeilometerAgentIpmi: ../../deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml OS::TripleO::Services::CeilometerAgentIpmi: ../../deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
parameter_defaults:
NotificationDriver: 'messagingv2'

View File

@ -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.