Merge "Enable upstream Cinder volume backup/restore capabilities"

This commit is contained in:
Zuul 2018-09-26 21:46:39 +00:00 committed by Gerrit Code Review
commit 2a05a16e54

View File

@ -170,6 +170,7 @@ destination d_heatengine { file("/var/log/heat/heat-engine.log" template(t_op
destination d_cinderapi { file("/var/log/cinder/cinder-api.log" template(t_openstack)); };
destination d_cinderscheduler { file("/var/log/cinder/cinder-scheduler.log" template(t_openstack)); };
destination d_cindervolume { file("/var/log/cinder/cinder-volume.log" template(t_openstack)); };
destination d_cinderbackup { file("/var/log/cinder/cinder-backup.log" template(t_openstack)); };
destination d_keystoneall { file("/var/log/keystone/keystone-all.log" template(t_openstack)); };
destination d_keystoneapi { file("/var/log/keystone/keystone-api.log" template(t_openstack)); };
destination d_glanceapi { file("/var/log/glance/glance-api.log" template(t_openstack)); };
@ -327,6 +328,7 @@ filter f_local2 { facility(local2)
and not program(cinder-api)
and not program(cinder-scheduler)
and not program(cinder-volume)
and not program(cinder-backup)
and not filter(f_keystoneall)
and not filter(f_keystoneapi)
and not filter(f_neutronapi); };
@ -396,6 +398,7 @@ filter f_heatengine { facility(local6) and program(heat-engine); };
filter f_cinderapi { facility(local2) and program(cinder-api); };
filter f_cinderscheduler { facility(local2) and program(cinder-scheduler); };
filter f_cindervolume { facility(local2) and program(cinder-volume); };
filter f_cinderbackup { facility(local2) and program(cinder-backup); };
filter f_glanceapi { facility(local2) and program(glance-api); };
filter f_glanceregistry { facility(local2) and program(glance-registry) and not match("eventlet.wsgi.server"); };
filter f_glanceregistryrest { facility(local2) and program(glance-registry) and match("eventlet.wsgi.server"); };
@ -514,6 +517,7 @@ log { source(s_src); filter(f_heatengine); destination(d_heatengine); };
log { source(s_src); filter(f_cinderapi); destination(d_cinderapi); };
log { source(s_src); filter(f_cinderscheduler); destination(d_cinderscheduler); };
log { source(s_src); filter(f_cindervolume); destination(d_cindervolume); };
log { source(s_src); filter(f_cinderbackup); destination(d_cinderbackup); };
log { source(s_src); filter(f_keystoneall); destination(d_keystoneall); };
log { source(s_src); filter(f_keystoneapi); destination(d_keystoneapi); };
log { source(s_src); filter(f_glanceapi); destination(d_glanceapi); };