Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 3e15937)
Add monitoring agents deployment to CI
authorMartin Mágr <mmagr@redhat.com>
Tue, 14 Feb 2017 21:15:45 +0000 (22:15 +0100)
committerMartin Mágr <mmagr@redhat.com>
Tue, 4 Apr 2017 19:52:04 +0000 (21:52 +0200)
This patch enables deployment of sensu-client service in scenario001.

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

README.rst patch | blob | history
ci/environments/scenario001-multinode.yaml patch | blob | history

diff --git a/README.rst b/README.rst
index 6097ca8..51a21f6 100644 (file)
--- 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 19e70f6..5e9c5cf 100644 (file)
--- 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