Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 5f9cc7d)
Add logging agents deployment to CI
authorMartin Mágr <mmagr@redhat.com>
Tue, 13 Dec 2016 13:02:22 +0000 (14:02 +0100)
committerMartin Mágr <mmagr@redhat.com>
Thu, 30 Mar 2017 19:56:15 +0000 (21:56 +0200)
This patch enables deployment of fluentd service in scenario001.

Depends-On: Ibabd4688c00c6a12ea22055c95563d906716954d
Change-Id: Ib24a67f9068efb60b754590503a503344ab1f1df

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

diff --git a/README.rst b/README.rst
index e2b59c5..6097ca8 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -128,3 +128,7 @@ and should be executed according to the following table:
 +----------------+-------------+-------------+-------------+-------------+-----------------+
 | manila         |             |             |             |      X      |                 |
 +----------------+-------------+-------------+-------------+-------------+-----------------+
+| collectd       |      X      |             |             |             |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| fluentd        |      X      |             |             |             |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+
diff --git a/ci/environments/scenario001-multinode.yaml b/ci/environments/scenario001-multinode.yaml
index 2203665..19e70f6 100644 (file)
--- a/ci/environments/scenario001-multinode.yaml
+++ b/ci/environments/scenario001-multinode.yaml
@@ -18,6 +18,7 @@ resource_registry:
   OS::TripleO::Tasks::ControllerPrePuppet: ../../extraconfig/tasks/pre_puppet_pacemaker.yaml
   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
 
 parameter_defaults:
   ControllerServices:
@@ -79,6 +80,8 @@ parameter_defaults:
     - OS::TripleO::Services::Congress
     - OS::TripleO::Services::TripleoPackages
     - OS::TripleO::Services::TripleoFirewall
+    - OS::TripleO::Services::FluentdClient
+
   ControllerExtraConfig:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
     nova::compute::libvirt::libvirt_virt_type: qemu
@@ -112,3 +115,6 @@ parameter_defaults:
     ******************************************************************
   CollectdExtraPlugins:
     - rrdtool
+  LoggingServers:
+    - host: 127.0.0.1
+      port: 24224