Merge "Disable notification from services by default"

This commit is contained in:
Zuul 2020-10-02 09:06:42 +00:00 committed by Gerrit Code Review
commit 55d1945c97
23 changed files with 32 additions and 15 deletions

View File

@ -107,6 +107,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

@ -42,9 +42,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

@ -34,6 +34,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

@ -59,7 +59,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

@ -153,7 +153,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

@ -82,7 +82,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

@ -55,7 +55,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

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

@ -205,7 +205,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

@ -125,7 +125,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

@ -181,7 +181,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

@ -55,7 +55,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

@ -52,7 +52,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.
KeystoneRegion: KeystoneRegion:
type: string type: string

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

@ -53,7 +53,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

@ -15,6 +15,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'
# 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

@ -11,3 +11,4 @@ resource_registry:
parameter_defaults: parameter_defaults:
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.