From: Martin Mágr <mmagr@redhat.com>
Date: Tue, 14 Feb 2017 21:15:45 +0000 (+0100)
Subject: Add monitoring agents deployment to CI
X-Git-Tag: opnfv-6.0.0~822^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0e858a28a40a190c8d3cdb6b332006c04497108a;p=apex-tripleo-heat-templates.git

Add monitoring agents deployment to CI

This patch enables deployment of sensu-client service in scenario001.

Depends-On: I4895e3b6d3d0e2c12c083133e423cafeecbafe88
Depends-On: Ibabd4688c00c6a12ea22055c95563d906716954d
Change-Id: I377811878712b7615c38094ecbf55dcc67d9ddd5
---

diff --git a/README.rst b/README.rst
index 6097ca85..51a21f6b 100644
--- a/README.rst
+++ b/README.rst
@@ -132,3 +132,5 @@ and should be executed according to the following table:
 +----------------+-------------+-------------+-------------+-------------+-----------------+
 | fluentd        |      X      |             |             |             |                 |
 +----------------+-------------+-------------+-------------+-------------+-----------------+
+| sensu-client   |      X      |             |             |             |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+
diff --git a/ci/environments/scenario001-multinode.yaml b/ci/environments/scenario001-multinode.yaml
index 19e70f60..5e9c5cfc 100644
--- a/ci/environments/scenario001-multinode.yaml
+++ b/ci/environments/scenario001-multinode.yaml
@@ -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:
@@ -81,6 +82,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
@@ -118,3 +120,6 @@ parameter_defaults:
   LoggingServers:
     - host: 127.0.0.1
       port: 24224
+  MonitoringRabbitHost: 127.0.0.1
+  MonitoringRabbitPort: 5676
+  MonitoringRabbitPassword: sensu