summaryrefslogtreecommitdiffstats
path: root/ci/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-06 03:38:42 +0000
committerGerrit Code Review <review@openstack.org>2017-04-06 03:38:42 +0000
commit706d79994b62a01cfabce12c7d75f6c71855b9c7 (patch)
tree2ef75d3e5cecb8c857d82b9100e346dd448b52f7 /ci/environments
parent0846b3d76e9ad8df1cba3bfe64afb419b47e76f0 (diff)
parent3e1593759db67045a49d6c9b74ab0684f6ebabd5 (diff)
Merge "Add logging agents deployment to CI"
Diffstat (limited to 'ci/environments')
-rw-r--r--ci/environments/scenario001-multinode.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/ci/environments/scenario001-multinode.yaml b/ci/environments/scenario001-multinode.yaml
index 29ca3898..1d11859d 100644
--- 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:
@@ -80,6 +81,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
@@ -113,3 +116,6 @@ parameter_defaults:
******************************************************************
CollectdExtraPlugins:
- rrdtool
+ LoggingServers:
+ - host: 127.0.0.1
+ port: 24224