Split QDR environment from collectd
This patch splits QDR configuration from shared environment file.
It also adds separates environment file for Ceilometer.
Change-Id: I6b5af0b5afcdec75fe239385922dc84fbbb8288c
(cherry picked from commit 7ed8ab86dd
)
This commit is contained in:
parent
2fdda9b318
commit
54b916ef72
|
@ -0,0 +1,11 @@
|
|||
## This environment serves the purpose of enabling ceilometer to send telemetry and notification data
|
||||
## through QPID dispatch routers.
|
||||
|
||||
resource_registry:
|
||||
OS::TripleO::Services::CeilometerAgentCentral: ../../docker/services/ceilometer-agent-central.yaml
|
||||
OS::TripleO::Services::CeilometerAgentNotification: ../../docker/services/ceilometer-agent-notification.yaml
|
||||
OS::TripleO::Services::CeilometerAgentIpmi: ../../docker/services/ceilometer-agent-ipmi.yaml
|
||||
OS::TripleO::Services::ComputeCeilometerAgent: ../../docker/services/ceilometer-agent-compute.yaml
|
||||
|
||||
parameter_defaults:
|
||||
CeilometerQdrPublish: true
|
|
@ -1,15 +1,11 @@
|
|||
## 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.
|
||||
|
||||
## This environment serves the purpose of enabling collectd to send telemetry and notification data
|
||||
## through QPID dispatch routers.
|
||||
|
||||
resource_registry:
|
||||
OS::TripleO::Services::Collectd: ../../docker/services/metrics/collectd.yaml
|
||||
OS::TripleO::Services::MetricsQdr: ../../docker/services/metrics/qdr.yaml
|
||||
|
||||
|
||||
parameter_defaults:
|
||||
CeilometerQdrPublish: true
|
||||
CollectdConnectionType: amqp1
|
||||
CollectdAmqpInstances:
|
||||
notify:
|
||||
|
@ -18,7 +14,7 @@ parameter_defaults:
|
|||
presettle: true
|
||||
telemetry:
|
||||
format: JSON
|
||||
presettle: false
|
||||
presettle: true
|
||||
#MetricsQdrConnectors:
|
||||
# - host: IP1
|
||||
# port: 1234
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
## This environment serves the purpose of enabling deployment of QPID dispatch routers (aka QDR).
|
||||
## Each overcloud node will have one local qdrouterd service running and operating in edge mode,
|
||||
## eg. sending received data straight to defined MetricsQdrConnectors
|
||||
|
||||
|
||||
resource_registry:
|
||||
OS::TripleO::Services::MetricsQdr: ../../docker/services/metrics/qdr.yaml
|
||||
|
||||
parameter_defaults:
|
||||
ExtraConfig:
|
||||
tripleo::profile::base::metrics::qdr::router_mode: edge
|
||||
#MetricsQdrConnectors:
|
||||
# - host: qdr-normal-sa-telemetry.apps.remote.tld
|
||||
# port: 443
|
||||
# role: inter-router
|
||||
# sslProfile: sslProfile
|
||||
# verifyHostname: false
|
||||
#MetricsQdrSSLProfiles:
|
||||
# - name: sslProfile
|
Loading…
Reference in New Issue