Merge "Add monitoring agents deployment to CI"

This commit is contained in:
Jenkins 2017-04-06 09:10:48 +00:00 committed by Gerrit Code Review
commit 35d70db4c1
2 changed files with 7 additions and 0 deletions

@ -132,3 +132,5 @@ and should be executed according to the following table:
+----------------+-------------+-------------+-------------+-------------+-----------------+
| fluentd | X | | | | |
+----------------+-------------+-------------+-------------+-------------+-----------------+
| sensu-client | X | | | | |
+----------------+-------------+-------------+-------------+-------------+-----------------+

@ -19,6 +19,7 @@ resource_registry:
OS::TripleO::Tasks::ControllerPostPuppet: ../../extraconfig/tasks/post_puppet_pacemaker.yaml
OS::TripleO::Tasks::ControllerPostPuppetRestart: ../../extraconfig/tasks/post_puppet_pacemaker_restart.yaml
OS::TripleO::Services::FluentdClient: /usr/share/openstack-tripleo-heat-templates/puppet/services/logging/fluentd-client.yaml
OS::TripleO::Services::SensuClient: /usr/share/openstack-tripleo-heat-templates/puppet/services/monitoring/sensu-client.yaml
parameter_defaults:
ControllerServices:
@ -82,6 +83,7 @@ parameter_defaults:
- OS::TripleO::Services::TripleoPackages
- OS::TripleO::Services::TripleoFirewall
- OS::TripleO::Services::FluentdClient
- OS::TripleO::Services::SensuClient
ControllerExtraConfig:
nova::compute::libvirt::services::libvirt_virt_type: qemu
@ -119,3 +121,6 @@ parameter_defaults:
LoggingServers:
- host: 127.0.0.1
port: 24224
MonitoringRabbitHost: 127.0.0.1
MonitoringRabbitPort: 5676
MonitoringRabbitPassword: sensu