From 491b545715f1e19b8aa96003e7514c0711e9d88c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 27 Mar 2020 20:00:48 +0900 Subject: [PATCH] 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 afc0b731e044ed3223fb62501cdb291bdb7bc138) (cherry picked from commit 7ab640cfa589fe8721845587c91e7839f3cd6a05) --- ci/environments/scenario001-multinode-containers.yaml | 1 + ci/environments/scenario001-standalone.yaml | 2 +- ci/environments/scenario002-standalone.yaml | 1 + deployment/aodh/aodh-base.yaml | 2 +- deployment/barbican/barbican-api-container-puppet.yaml | 2 +- deployment/ceilometer/ceilometer-base-container-puppet.yaml | 2 +- deployment/cinder/cinder-api-container-puppet.yaml | 2 +- deployment/experimental/designate/designate-base.yaml | 2 +- deployment/glance/glance-api-container-puppet.yaml | 2 +- deployment/heat/heat-base-puppet.yaml | 2 +- deployment/keystone/keystone-container-puppet.yaml | 2 +- deployment/manila/manila-base.yaml | 2 +- deployment/mistral/mistral-base.yaml | 2 +- deployment/neutron/neutron-base.yaml | 2 +- deployment/nova/nova-base-puppet.yaml | 2 +- deployment/octavia/octavia-base.yaml | 2 +- deployment/sahara/sahara-base.yaml | 2 +- environments/enable-legacy-telemetry.yaml | 1 + environments/enable-stf.yaml | 1 + environments/metrics/ceilometer-write-qdr.yaml | 1 + environments/services-baremetal/undercloud-ceilometer.yaml | 3 +++ environments/services/undercloud-ceilometer.yaml | 3 +++ .../notes/disable-notification-driver-a888d4e9b8eed1dc.yaml | 6 ++++++ 23 files changed, 32 insertions(+), 15 deletions(-) create mode 100644 releasenotes/notes/disable-notification-driver-a888d4e9b8eed1dc.yaml diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index 55b6fac521..cb3f067eb1 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -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 diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml index ad9f596ce7..77c96ae60f 100644 --- a/ci/environments/scenario001-standalone.yaml +++ b/ci/environments/scenario001-standalone.yaml @@ -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 diff --git a/ci/environments/scenario002-standalone.yaml b/ci/environments/scenario002-standalone.yaml index 279a715ff0..d6fe17a49f 100644 --- a/ci/environments/scenario002-standalone.yaml +++ b/ci/environments/scenario002-standalone.yaml @@ -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 diff --git a/deployment/aodh/aodh-base.yaml b/deployment/aodh/aodh-base.yaml index 3c4340526e..5ae3a9ab54 100644 --- a/deployment/aodh/aodh-base.yaml +++ b/deployment/aodh/aodh-base.yaml @@ -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: diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml index 639a62432c..13266e626f 100644 --- a/deployment/barbican/barbican-api-container-puppet.yaml +++ b/deployment/barbican/barbican-api-container-puppet.yaml @@ -156,7 +156,7 @@ parameters: type: json NotificationDriver: type: string - default: 'messagingv2' + default: 'noop' description: Driver or drivers to handle sending notifications. DeployIdentifier: default: '' diff --git a/deployment/ceilometer/ceilometer-base-container-puppet.yaml b/deployment/ceilometer/ceilometer-base-container-puppet.yaml index d87b655ebe..f407585730 100644 --- a/deployment/ceilometer/ceilometer-base-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-base-container-puppet.yaml @@ -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' diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index 77bf0cd68f..0c2737aa52 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -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. diff --git a/deployment/experimental/designate/designate-base.yaml b/deployment/experimental/designate/designate-base.yaml index 248c9c9c64..95feee4885 100644 --- a/deployment/experimental/designate/designate-base.yaml +++ b/deployment/experimental/designate/designate-base.yaml @@ -64,7 +64,7 @@ parameters: type: number NotificationDriver: type: string - default: 'messagingv2' + default: 'noop' description: Driver or drivers to handle sending notifications. parameter_groups: diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index 5416c3261b..b434f658f2 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/deployment/glance/glance-api-container-puppet.yaml @@ -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 diff --git a/deployment/heat/heat-base-puppet.yaml b/deployment/heat/heat-base-puppet.yaml index 05a4038171..a8fac479d0 100644 --- a/deployment/heat/heat-base-puppet.yaml +++ b/deployment/heat/heat-base-puppet.yaml @@ -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 diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index bfbec77033..6d7eb21b70 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -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 diff --git a/deployment/manila/manila-base.yaml b/deployment/manila/manila-base.yaml index 085be6fab5..ae97a189f9 100644 --- a/deployment/manila/manila-base.yaml +++ b/deployment/manila/manila-base.yaml @@ -50,7 +50,7 @@ parameters: hidden: true NotificationDriver: type: string - default: 'messagingv2' + default: 'noop' description: Driver or drivers to handle sending notifications. conditions: diff --git a/deployment/mistral/mistral-base.yaml b/deployment/mistral/mistral-base.yaml index 6fbbdc0207..f4d9a073ea 100644 --- a/deployment/mistral/mistral-base.yaml +++ b/deployment/mistral/mistral-base.yaml @@ -47,7 +47,7 @@ parameters: hidden: true NotificationDriver: type: string - default: 'messagingv2' + default: 'noop' description: Driver or drivers to handle sending notifications. conditions: diff --git a/deployment/neutron/neutron-base.yaml b/deployment/neutron/neutron-base.yaml index d2eea05a5e..c05321942f 100644 --- a/deployment/neutron/neutron-base.yaml +++ b/deployment/neutron/neutron-base.yaml @@ -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 diff --git a/deployment/nova/nova-base-puppet.yaml b/deployment/nova/nova-base-puppet.yaml index 59f49b7ac9..6e6e534595 100644 --- a/deployment/nova/nova-base-puppet.yaml +++ b/deployment/nova/nova-base-puppet.yaml @@ -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 diff --git a/deployment/octavia/octavia-base.yaml b/deployment/octavia/octavia-base.yaml index 6aae08ca80..28d6c7713b 100644 --- a/deployment/octavia/octavia-base.yaml +++ b/deployment/octavia/octavia-base.yaml @@ -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. diff --git a/deployment/sahara/sahara-base.yaml b/deployment/sahara/sahara-base.yaml index 3318b096cd..f95cfc7823 100644 --- a/deployment/sahara/sahara-base.yaml +++ b/deployment/sahara/sahara-base.yaml @@ -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'] diff --git a/environments/enable-legacy-telemetry.yaml b/environments/enable-legacy-telemetry.yaml index bdbb32b72b..bd34191da9 100644 --- a/environments/enable-legacy-telemetry.yaml +++ b/environments/enable-legacy-telemetry.yaml @@ -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' diff --git a/environments/enable-stf.yaml b/environments/enable-stf.yaml index 436a6c8af6..9254e97e86 100644 --- a/environments/enable-stf.yaml +++ b/environments/enable-stf.yaml @@ -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 diff --git a/environments/metrics/ceilometer-write-qdr.yaml b/environments/metrics/ceilometer-write-qdr.yaml index dd8bbaa39d..0bbf9613f4 100644 --- a/environments/metrics/ceilometer-write-qdr.yaml +++ b/environments/metrics/ceilometer-write-qdr.yaml @@ -12,3 +12,4 @@ parameter_defaults: CeilometerEnablePanko: false CeilometerQdrPublishEvents: true CeilometerQdrPublisMetrics: true + NotificationDriver: 'messagingv2' diff --git a/environments/services-baremetal/undercloud-ceilometer.yaml b/environments/services-baremetal/undercloud-ceilometer.yaml index 4c03852ee4..8da5d77b2d 100644 --- a/environments/services-baremetal/undercloud-ceilometer.yaml +++ b/environments/services-baremetal/undercloud-ceilometer.yaml @@ -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' diff --git a/environments/services/undercloud-ceilometer.yaml b/environments/services/undercloud-ceilometer.yaml index 4ba768919f..01c9930a14 100644 --- a/environments/services/undercloud-ceilometer.yaml +++ b/environments/services/undercloud-ceilometer.yaml @@ -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' diff --git a/releasenotes/notes/disable-notification-driver-a888d4e9b8eed1dc.yaml b/releasenotes/notes/disable-notification-driver-a888d4e9b8eed1dc.yaml new file mode 100644 index 0000000000..39b6519d3b --- /dev/null +++ b/releasenotes/notes/disable-notification-driver-a888d4e9b8eed1dc.yaml @@ -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.