openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add ironic inspector to fluentd log collection"

Browse Source
This commit is contained in:
Zuul 2018-01-08 08:52:09 +00:00 committed by Gerrit Code Review
commit 9132860118
3 changed files with 3 additions and 2 deletions
ansible/roles/common/templates/conf
filter
01-rewrite-0.12.conf.j201-rewrite-0.14.conf.j2
input
00-global.conf.j2

2
ansible/roles/common/templates/conf/filter/01-rewrite-0.12.conf.j2

@ -28,7 +28,7 @@
rewriterule25 programname ^(zun-api|zun-compute)$ openstack_python
rewriterule26 programname ^(kuryr-server)$ openstack_python
rewriterule27 programname ^(gnocchi-api|gnocchi-statsd|gnocchi-metricd|gnocchi-upgrade)$ openstack_python
rewriterule28 programname ^(ironic-api|ironic-conductor)$ openstack_python
rewriterule28 programname ^(ironic-api|ironic-conductor|ironic-inspector)$ openstack_python
rewriterule29 programname ^(panko-api|panko-dbsync)$ openstack_python
rewriterule30 programname ^(tacker-server|tacker-conductor)$ openstack_python
rewriterule31 programname ^(vitrage-collector|vitrage-ml|vitrage-notifier|vitrage-graph)$ openstack_python

2
ansible/roles/common/templates/conf/filter/01-rewrite-0.14.conf.j2

@ -138,7 +138,7 @@
</rule>
<rule>
key programname
pattern ^(ironic-api|ironic-conductor)$
pattern ^(ironic-api|ironic-conductor|ironic-inspector)$
tag openstack_python
</rule>
<rule>

1
ansible/roles/common/templates/conf/input/00-global.conf.j2

@ -14,6 +14,7 @@
( 'heat', enable_heat ),
( 'horizon', enable_horizon ),
( 'ironic', enable_ironic ),
( 'ironic-inspector', enable_ironic ),
( 'karbor', enable_karbor ),
( 'keystone', enable_keystone ),
( 'kuryr', enable_kuryr ),