Merge "Add logging agents deployment to CI"

This commit is contained in:
Jenkins 2017-04-06 03:38:42 +00:00 committed by Gerrit Code Review
commit 706d79994b
2 changed files with 10 additions and 0 deletions

View File

@ -128,3 +128,7 @@ and should be executed according to the following table:
+----------------+-------------+-------------+-------------+-------------+-----------------+ +----------------+-------------+-------------+-------------+-------------+-----------------+
| manila | | | | X | | | manila | | | | X | |
+----------------+-------------+-------------+-------------+-------------+-----------------+ +----------------+-------------+-------------+-------------+-------------+-----------------+
| collectd | X | | | | |
+----------------+-------------+-------------+-------------+-------------+-----------------+
| fluentd | X | | | | |
+----------------+-------------+-------------+-------------+-------------+-----------------+

View File

@ -18,6 +18,7 @@ resource_registry:
OS::TripleO::Tasks::ControllerPrePuppet: ../../extraconfig/tasks/pre_puppet_pacemaker.yaml OS::TripleO::Tasks::ControllerPrePuppet: ../../extraconfig/tasks/pre_puppet_pacemaker.yaml
OS::TripleO::Tasks::ControllerPostPuppet: ../../extraconfig/tasks/post_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::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: parameter_defaults:
ControllerServices: ControllerServices:
@ -80,6 +81,8 @@ parameter_defaults:
- OS::TripleO::Services::Congress - OS::TripleO::Services::Congress
- OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::TripleoPackages
- OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoFirewall
- OS::TripleO::Services::FluentdClient
ControllerExtraConfig: ControllerExtraConfig:
nova::compute::libvirt::services::libvirt_virt_type: qemu nova::compute::libvirt::services::libvirt_virt_type: qemu
nova::compute::libvirt::libvirt_virt_type: qemu nova::compute::libvirt::libvirt_virt_type: qemu
@ -113,3 +116,6 @@ parameter_defaults:
****************************************************************** ******************************************************************
CollectdExtraPlugins: CollectdExtraPlugins:
- rrdtool - rrdtool
LoggingServers:
- host: 127.0.0.1
port: 24224