x/whitebox-neutron-tempest-plugin
Code Issues Proposed changes

Merge "Make use of the utility method `get_ml2_conf_file`"

Browse Source
This commit is contained in:
Zuul 2024-09-16 17:39:47 +00:00 committed by Gerrit Code Review
commit f0c681a9b7
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
whitebox_neutron_tempest_plugin/tests/scenario/test_security_group_logging.py
View File

@ -48,18 +48,15 @@ class BaseSecGroupLoggingTest(
credentials = ['primary', 'admin'] credentials = ['primary', 'admin']
required_extensions = ['router', 'security-group', 'logging'] required_extensions = ['router', 'security-group', 'logging']
ML2_CONF_FILE = utils.get_ml2_conf_file()
if WB_CONF.openstack_type == 'podified': if WB_CONF.openstack_type == 'podified':
SG_LOG_FILE = '/var/log/messages' SG_LOG_FILE = '/var/log/messages'
ML2_CONF_FILE = '/etc/neutron/plugins/ml2/ml2_conf.ini'
rotate_service_fix = '-crond' rotate_service_fix = '-crond'
elif WB_CONF.openstack_type == 'devstack': elif WB_CONF.openstack_type == 'devstack':
SG_LOG_FILE = '/opt/stack/logs/ovn-controller.log' SG_LOG_FILE = '/opt/stack/logs/ovn-controller.log'
ML2_CONF_FILE = '/etc/neutron/plugins/ml2/ml2_conf.ini'
rotate_service_fix = '' rotate_service_fix = ''
else: else:
SG_LOG_FILE = '/var/log/containers/stdouts/ovn_controller.log' 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' rotate_service_fix = '-crond'
ROTATION_CHECK_CMD = ( ROTATION_CHECK_CMD = (
'/usr/sbin/logrotate -s /var/lib/logrotate/' '/usr/sbin/logrotate -s /var/lib/logrotate/'