diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-03 22:42:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-03 22:42:31 +0000 |
| commit | 67864c318b497c4bed71b89cfabcc6afe4e7385c (patch) | |
| tree | 37bc7f0bb755e6d42f2494bec4ed2087b5a307df /ansible | |
| parent | d3b6752a65f00586be3fdb1c948703f2125bb7b2 (diff) | |
| parent | 285e42a99c74848d12eaf9e81e86a6431fab3cac (diff) | |
| download | kolla-67864c318b497c4bed71b89cfabcc6afe4e7385c.tar.gz kolla-67864c318b497c4bed71b89cfabcc6afe4e7385c.zip | |
Merge "Make Heka collect Manila logs"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/common/templates/heka-openstack.toml.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/manila/templates/manila.conf.j2 | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/ansible/roles/common/templates/heka-openstack.toml.j2 b/ansible/roles/common/templates/heka-openstack.toml.j2 index 3649705b6..32c20514a 100644 --- a/ansible/roles/common/templates/heka-openstack.toml.j2 +++ b/ansible/roles/common/templates/heka-openstack.toml.j2 @@ -6,5 +6,5 @@ filename = "lua_decoders/os_openstack_log.lua" type = "LogstreamerInput" decoder = "openstack_log_decoder" log_directory = "/var/log/kolla" -file_match = '(?P<Service>nova|glance|keystone|neutron|cinder|heat|murano|magnum|mistral)/(?P<Program>.*)\.log' +file_match = '(?P<Service>nova|glance|keystone|neutron|cinder|heat|murano|magnum|mistral|manila)/(?P<Program>.*)\.log' differentiator = ["Service", "_", "Program"] diff --git a/ansible/roles/manila/templates/manila.conf.j2 b/ansible/roles/manila/templates/manila.conf.j2 index 16355c760..907578e41 100644 --- a/ansible/roles/manila/templates/manila.conf.j2 +++ b/ansible/roles/manila/templates/manila.conf.j2 @@ -2,7 +2,6 @@ debug = {{ manila_logging_debug }} log_dir = /var/log/kolla/manila -use_forwarded_for = true my_ip = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} |