Merge "Disable notification from services by default" into stable/ussuri

2020-12-02 03:09:21 +00:00 · 2020-12-02 03:09:21 +00:00 · 3c7c04d7a4
parent 59c8d4a7d3 7ab640cfa5
commit 3c7c04d7a4
23 changed files with 32 additions and 15 deletions
--- 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
--- a/ci/environments/scenario001-standalone.yaml
+++ b/ci/environments/scenario001-standalone.yaml
@ -44,9 +44,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
--- 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
--- 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:
--- 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: ''
--- 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'
--- 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.
--- 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']
--- 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:
--- a/deployment/glance/glance-api-container-puppet.yaml
+++ b/deployment/glance/glance-api-container-puppet.yaml
@ -199,7 +199,7 @@ parameters:
    type: json
  NotificationDriver:
    type: string
-    default: 'messagingv2'
+    default: 'noop'
    description: Driver or drivers to handle sending notifications.
  EnableInternalTLS:
    type: boolean
--- 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
--- 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
--- 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:
--- 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
--- 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
--- 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
--- 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.
--- 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'
--- 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
--- 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'
--- 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'
--- 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'
--- a/releasenotes/notes/disable-notification-driver-a888d4e9b8eed1dc.yaml
+++ 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.