## This environment servers the purpose of enabling collectd to send metrics
## through mesh of QPID dispatch routers. Each overcloud node will have one local
## qdrouterd service running and collectd will send data to it.


resource_registry:
  OS::TripleO::Services::Collectd: ../../deployment/metrics/collectd-container-puppet.yaml
  OS::TripleO::Services::MetricsQdr: ../../deployment/metrics/qdr-container-puppet.yaml


parameter_defaults:
  CeilometerQdrPublish: true
  CollectdConnectionType: amqp1
  CollectdAmqpInstances:
    notify:
      notify: true
      format: JSON
      presettle: true
    telemetry:
      format: JSON
      presettle: false
  #MetricsQdrConnectors:
  #  - host: IP1
  #    port: 1234
  #    role: inter-router
  #  - host: IP2
  #    port: 5678
  #    role: inter-router

## This environment servers the purpose of enabling collectd to send metrics
## through mesh of QPID dispatch routers. Each overcloud node will have one local
## qdrouterd service running and collectd will send data to it.


resource_registry:
  OS::TripleO::Services::Collectd: ../../deployment/metrics/collectd-container-puppet.yaml
  OS::TripleO::Services::MetricsQdr: ../../deployment/metrics/qdr-container-puppet.yaml


parameter_defaults:
  CeilometerQdrPublish: true
  CollectdConnectionType: amqp1
  CollectdAmqpInstances:
    notify:
      notify: true
      format: JSON
      presettle: false
    telemetry:
      format: JSON
      presettle: true
  #MetricsQdrConnectors:
  #  - host: IP1
  #    port: 1234
  #    role: inter-router
  #  - host: IP2
  #    port: 5678
  #    role: inter-router

Fix the amqp presettle option for metrics and events in collectd
Fix the amqp presettle option for metrics and events in collectd

The values for presettle were incorrect for metrics and events sent
via AMQP.
Events should NOT be pre-settled, as they need to be ack'd to
ensure that all messages are delivered.
Metrics should be presettled as they don't require an ack.

Change-Id: I6aae1c8029cf6c9fff52a79d7a1519888f46dd81
