Merge "Make use of the utility method `get_ml2_conf_file
`"
This commit is contained in:
commit
f0c681a9b7
@ -48,18 +48,15 @@ class BaseSecGroupLoggingTest(
|
||||
credentials = ['primary', 'admin']
|
||||
required_extensions = ['router', 'security-group', 'logging']
|
||||
|
||||
ML2_CONF_FILE = utils.get_ml2_conf_file()
|
||||
if WB_CONF.openstack_type == 'podified':
|
||||
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':
|
||||
SG_LOG_FILE = '/opt/stack/logs/ovn-controller.log'
|
||||
ML2_CONF_FILE = '/etc/neutron/plugins/ml2/ml2_conf.ini'
|
||||
rotate_service_fix = ''
|
||||
else:
|
||||
SG_LOG_FILE = '/var/log/containers/stdouts/ovn_controller.log'
|
||||
ML2_CONF_FILE = ('/var/lib/config-data/puppet-generated'
|
||||
'/neutron/etc/neutron/plugins/ml2/ml2_conf.ini')
|
||||
rotate_service_fix = '-crond'
|
||||
ROTATION_CHECK_CMD = (
|
||||
'/usr/sbin/logrotate -s /var/lib/logrotate/'
|
||||
|
Loading…
Reference in New Issue
Block a user