Drop CollectdAmqpInstances from collectd-write-qdr.yaml

Drop the CollectdAmqpInstances parameter from collectd-write-qdr.yaml in
order to allow an administrator to override the default specified
topics. If the administrator of the cloud used collectd-write-qdr.yaml
and then needed to override the topics, a merge of the defaults and
custom topics would be added to the 10-amqp.conf for collectd, resulting
in data being published to unused topics.

Change-Id: I554d8677156934c4d49acb1346afea16339ad5c2
Signed-off-by: Leif Madsen <lmadsen@redhat.com>
(cherry picked from commit 591f2aa2d8)

environments/metrics/collectd-write-qdr.yaml

@@ -7,11 +7,3 @@ resource_registry:
 parameter_defaults:
   CollectdConnectionType: amqp1
   CollectdAmqpSendQueueLimit: 40
-  CollectdAmqpInstances:
-    notify:
-      notify: true
-      format: JSON
-      presettle: false
-    telemetry:
-      format: JSON
-      presettle: false

releasenotes/notes/collectd-write-qdr-f790703e3f0c3245.yaml

@@ -0,0 +1,16 @@
+---
+prelude: >
+  Environment file collectd-write-qdr.yaml no longer specifies a default
+  CollectdAmqpInstances hash.
+upgrade:
+  - |
+    When upgrading an environment that uses collectd-write-qdr.yaml the
+    CollectdAmqpInstances defaults previously specified need to be added to an
+    administrator provided environment file and used during the overcloud
+    deploy process.
+fixes:
+  - |
+    The collectd-write-qdr.yaml no longer specifies a default
+    CollectdAmqpInstances hash. When specified, it was not possible to override
+    the parameter, resulting in a combined hash of the default values and the
+    administrators custom values which could lead to unexpected issues.