aboutsummaryrefslogtreecommitdiffstats
path: root/ci/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-08 06:58:48 +0000
committerGerrit Code Review <review@openstack.org>2017-02-08 06:58:48 +0000
commit76b53b3e2c6d6fa2e4487ed787e28a9fef1d259e (patch)
tree5210bd572feb9c7ca0dd5c4b30063913df978776 /ci/environments
parent9dc9c65522f04a782f5d60dc903b50af7f684392 (diff)
parent490c19bb38fb246347ba4a7c9dbc507ee46dac9c (diff)
Merge "implement a collectd composable service"
Diffstat (limited to 'ci/environments')
-rw-r--r--ci/environments/scenario001-multinode.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/ci/environments/scenario001-multinode.yaml b/ci/environments/scenario001-multinode.yaml
index f75c0fd3..69bf7c90 100644
--- a/ci/environments/scenario001-multinode.yaml
+++ b/ci/environments/scenario001-multinode.yaml
@@ -5,6 +5,7 @@ resource_registry:
OS::TripleO::Services::CephOSD: /usr/share/openstack-tripleo-heat-templates/puppet/services/ceph-osd.yaml
OS::TripleO::Services::CephClient: /usr/share/openstack-tripleo-heat-templates/puppet/services/ceph-client.yaml
OS::TripleO::Services::PankoApi: /usr/share/openstack-tripleo-heat-templates/puppet/services/panko-api.yaml
+ OS::TripleO::Services::Collectd: /usr/share/openstack-tripleo-heat-templates/puppet/services/metrics/collectd.yaml
parameter_defaults:
ControllerServices:
@@ -60,6 +61,7 @@ parameter_defaults:
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume
+ - OS::TripleO::Services::Collectd
ControllerExtraConfig:
nova::compute::libvirt::services::libvirt_virt_type: qemu
nova::compute::libvirt::libvirt_virt_type: qemu
@@ -91,3 +93,5 @@ parameter_defaults:
* evidence of criminal activity, system personnel may provide *
* the evidence from such monitoring to law enforcement officials.*
******************************************************************
+ CollectdExtraPlugins:
+ - rrdtool