Merge "Fix SGL tests log file for podified"
This commit is contained in:
commit
a031da7806
@ -49,7 +49,7 @@ class BaseSecGroupLoggingTest(
|
||||
required_extensions = ['router', 'security-group', 'logging']
|
||||
|
||||
if WB_CONF.openstack_type == 'podified':
|
||||
SG_LOG_FILE = '/var/log/containers/openvswitch/ovn-controller.log'
|
||||
SG_LOG_FILE = '/var/log/messages'
|
||||
ML2_CONF_FILE = '/etc/neutron/plugins/ml2/ml2_conf.ini'
|
||||
rotate_service_fix = '-crond'
|
||||
elif WB_CONF.openstack_type == 'devstack':
|
||||
@ -786,8 +786,9 @@ class BaseSecGroupLoggingTest(
|
||||
rotate_prefix + 'grep maxsize /etc/logrotate{}.conf; true'.format(
|
||||
self.rotate_service_fix),
|
||||
ssh_client=vm_a['hv_ssh_client']).rstrip().split(' ')[-1]
|
||||
# if setup type supports log rotation due to size, then test
|
||||
if maxsize_si:
|
||||
# if setup type supports log rotation due to size, then test.
|
||||
# also skips rotation test on podified since logging to journal
|
||||
if maxsize_si and WB_CONF.openstack_type != 'podified':
|
||||
# convert to bytes without SI prefixes k/M/G (logrotate SI options)
|
||||
try:
|
||||
power = 10 * ('kMG'.index(maxsize_si[-1]) + 1)
|
||||
|
Loading…
Reference in New Issue
Block a user