commit afc0b731e044ed3223fb62501cdb291bdb7bc138 Author: Takashi Kajinami Date: Fri Mar 27 20:00:48 2020 +0900 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 diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index e4d63af..f05d41b 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -107,6 +107,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 87fdb09..be9a686 100644 --- a/ci/environments/scenario001-standalone.yaml +++ b/ci/environments/scenario001-standalone.yaml @@ -42,9 +42,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 e95e78f..ef48005 100644 --- a/ci/environments/scenario002-standalone.yaml +++ b/ci/environments/scenario002-standalone.yaml @@ -34,6 +34,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 e073dd9..918e572 100644 --- a/deployment/aodh/aodh-base.yaml +++ b/deployment/aodh/aodh-base.yaml @@ -59,7 +59,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 0df9ec3..8d4e2c7 100644 --- a/deployment/barbican/barbican-api-container-puppet.yaml +++ b/deployment/barbican/barbican-api-container-puppet.yaml @@ -153,7 +153,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 0c7f5bd..ea08309 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 eb3de89..81b069f 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -82,7 +82,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/deprecated/sahara/sahara-base.yaml b/deployment/deprecated/sahara/sahara-base.yaml index a2e34fe..3ffb405 100644 --- a/deployment/deprecated/sahara/sahara-base.yaml +++ b/deployment/deprecated/sahara/sahara-base.yaml @@ -55,7 +55,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/deployment/experimental/designate/designate-base.yaml b/deployment/experimental/designate/designate-base.yaml index 248c9c9..95feee4 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 6eabe6d..c898479 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/deployment/glance/glance-api-container-puppet.yaml @@ -205,7 +205,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 0bafa37..c36c61c 100644 --- a/deployment/heat/heat-base-puppet.yaml +++ b/deployment/heat/heat-base-puppet.yaml @@ -125,7 +125,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 ac346a9..06ccf86 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -181,7 +181,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 d89566e..4ab1b0b 100644 --- a/deployment/manila/manila-base.yaml +++ b/deployment/manila/manila-base.yaml @@ -55,7 +55,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 df484ae..2b353a9 100644 --- a/deployment/mistral/mistral-base.yaml +++ b/deployment/mistral/mistral-base.yaml @@ -52,7 +52,7 @@ parameters: hidden: true NotificationDriver: type: string - default: 'messagingv2' + default: 'noop' description: Driver or drivers to handle sending notifications. KeystoneRegion: type: string diff --git a/deployment/neutron/neutron-base.yaml b/deployment/neutron/neutron-base.yaml index d2eea05..c053219 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 897430f..d9fa5ce 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 9949fc2..458c1f5 100644 --- a/deployment/octavia/octavia-base.yaml +++ b/deployment/octavia/octavia-base.yaml @@ -53,7 +53,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/environments/enable-legacy-telemetry.yaml b/environments/enable-legacy-telemetry.yaml index 468a5f4..8f79dbc 100644 --- a/environments/enable-legacy-telemetry.yaml +++ b/environments/enable-legacy-telemetry.yaml @@ -15,6 +15,7 @@ resource_registry: OS::TripleO::Services::ComputeCeilometerAgent: ../deployment/ceilometer/ceilometer-agent-compute-container-puppet.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 436a6c8..9254e97 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 f61b6fc..4387f7b 100644 --- a/environments/metrics/ceilometer-write-qdr.yaml +++ b/environments/metrics/ceilometer-write-qdr.yaml @@ -11,3 +11,4 @@ resource_registry: parameter_defaults: CeilometerQdrPublishEvents: true CeilometerQdrPublisMetrics: true + NotificationDriver: 'messagingv2' diff --git a/environments/services-baremetal/undercloud-ceilometer.yaml b/environments/services-baremetal/undercloud-ceilometer.yaml index 4c03852..8da5d77 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 4ba7689..01c9930 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 0000000..39b6519 --- /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.