From 9a30798b3e7dff23cae0df2ee4b0566d37d23937 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Mon, 8 Feb 2021 15:35:48 +0000 Subject: [PATCH] [collectd] Fix CollectdAmqpSendQueueLimit references The option CollectdAmqpSendQueueLimit was introduced in [1] to limit the memory usage of the collectd-amqp1 plugin. The incorrect CollectdAmqpQueueLimit option is passed into environment files. References to the CollectdAmqpQueueLimit config option have been replaced with CollectdAmqpSendQueueLimit, to allow for correct configuration. [1] https://review.opendev.org/c/openstack/tripleo-heat-templates/+/755288 Change-Id: Ibbcdfb1d148af33e5f4b82763119adf1d61b4203 --- ci/environments/scenario001-standalone.yaml | 2 +- environments/enable-stf.yaml | 2 +- environments/metrics/collectd-write-qdr.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml index c6f080a911..f211e02571 100644 --- a/ci/environments/scenario001-standalone.yaml +++ b/ci/environments/scenario001-standalone.yaml @@ -149,7 +149,7 @@ parameter_defaults: telemetry: format: JSON presettle: false - CollectdAmqpQueueLimit: 40 + CollectdAmqpSendQueueLimit: 40 LoggingServers: - host: 127.0.0.1 port: 24224 diff --git a/environments/enable-stf.yaml b/environments/enable-stf.yaml index 03d5dad999..f18296d8a5 100644 --- a/environments/enable-stf.yaml +++ b/environments/enable-stf.yaml @@ -15,7 +15,7 @@ parameter_defaults: CollectdConnectionType: amqp1 CollectdAmqpInterval: 5 CollectdDefaultPollingInterval: 5 - CollectdAmqpQueueLimit: 40 + CollectdAmqpSendQueueLimit: 40 CollectdAmqpInstances: notify: diff --git a/environments/metrics/collectd-write-qdr.yaml b/environments/metrics/collectd-write-qdr.yaml index 9eff8e60f2..0bec15b0a5 100644 --- a/environments/metrics/collectd-write-qdr.yaml +++ b/environments/metrics/collectd-write-qdr.yaml @@ -6,7 +6,7 @@ resource_registry: parameter_defaults: CollectdConnectionType: amqp1 - CollectdAmqpQueueLimit: 40 + CollectdAmqpSendQueueLimit: 40 CollectdAmqpInstances: notify: notify: true