openstack/kolla-ansible
Code Issues Proposed changes

Make heka collect libvirtd.log in nova_libvirt container

Browse Source 
Test results of this patch set are at:
http://paste.openstack.org/show/491382/

Change-Id: I1bc8bdb3180f30dc69af28a35fa057ac801bde0f
Closes-Bug: #1560298
This commit is contained in:
Vikram Hosakote 2016-03-22 02:00:50 +00:00
parent d68644386f
commit 7af0ab9ba9
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/common/templates/heka-openstack.toml.j2
View File

@ -6,6 +6,6 @@ filename = "lua_decoders/os_openstack_log.lua"
type = "LogstreamerInput" type = "LogstreamerInput"
decoder = "openstack_log_decoder" decoder = "openstack_log_decoder"
log_directory = "/var/log/kolla" log_directory = "/var/log/kolla"
file_match = '(?P<Service>nova|glance|keystone|neutron|cinder|heat|murano|magnum|mistral|manila)/(?P<Program>.*)\.log\.?(?P<Seq>\d*)$' file_match = '(?P<Service>nova|glance|keystone|neutron|cinder|heat|murano|magnum|mistral|manila|libvirtd)/(?P<Program>.*)\.log\.?(?P<Seq>\d*)$'
priority = ["^Seq"] priority = ["^Seq"]
differentiator = ["Service", "_", "Program"] differentiator = ["Service", "_", "Program"]

1
ansible/roles/nova/tasks/start_compute.yml
View File

@ -12,6 +12,7 @@
- "/lib/modules:/lib/modules:ro" - "/lib/modules:/lib/modules:ro"
- "/run/:/run/" - "/run/:/run/"
- "/sys/fs/cgroup:/sys/fs/cgroup" - "/sys/fs/cgroup:/sys/fs/cgroup"
- "kolla_logs:/var/log/kolla/"
- "libvirtd:/var/lib/libvirt" - "libvirtd:/var/lib/libvirt"
- "nova_compute:/var/lib/nova/" - "nova_compute:/var/lib/nova/"
when: inventory_hostname in groups['compute'] when: inventory_hostname in groups['compute']

2
ansible/roles/nova/templates/libvirtd.conf.j2
View File

@ -2,5 +2,5 @@ listen_tcp = 1
auth_tcp = "none" auth_tcp = "none"
ca_file = "" ca_file = ""
log_level = 3 log_level = 3
log_outputs = "3:file:/var/log/libvirt/libvirtd.log" log_outputs = "3:file:/var/log/kolla/libvirt/libvirtd.log"
listen_addr = "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}" listen_addr = "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"

7
docker/nova/nova-libvirt/extend_start.sh
View File

@ -12,3 +12,10 @@ fi
if [[ $(lsmod | grep xenfs) ]]; then if [[ $(lsmod | grep xenfs) ]]; then
mount -t xenfs xenfs /proc/xen mount -t xenfs xenfs /proc/xen
fi fi
if [[ ! -d "/var/log/kolla/libvirt" ]]; then
mkdir -p /var/log/kolla/libvirt
fi
if [[ $(stat -c %a /var/log/kolla/libvirt) != "755" ]]; then
chmod 755 /var/log/kolla/libvirt
fi