Browse Source

Merge "Remove "vf_management" and "vf_extended_management" checks"

changes/61/743661/1
Zuul 6 days ago
committed by Gerrit Code Review
parent
commit
900ccfd068
2 changed files with 1 additions and 19 deletions
  1. +1
    -15
      doc/source/cli/neutron-sanity-check.rst
  2. +0
    -4
      neutron/cmd/sanity_check.py

+ 1
- 15
doc/source/cli/neutron-sanity-check.rst View File

@@ -36,14 +36,12 @@ neutron-sanity-check usage
[--noovs_conntrack] [--noovs_geneve]
[--noovs_patch] [--noovs_vxlan] [--noovsdb_native]
[--noread_netns] [--nouse-syslog] [--nova_notify]
[--noverbose] [--novf_extended_management]
[--novf_management] [--nowatch-log-file]
[--noverbose] [--nowatch-log-file]
[--ovs_conntrack] [--ovs_geneve] [--ovs_patch]
[--ovs_vxlan] [--ovsdb_native] [--read_netns]
[--state_path STATE_PATH]
[--syslog-log-facility SYSLOG_LOG_FACILITY]
[--use-syslog] [--verbose] [--version]
[--vf_extended_management] [--vf_management]
[--watch-log-file]

neutron-sanity-check optional arguments
@@ -200,12 +198,6 @@ neutron-sanity-check optional arguments
``--noverbose``
The inverse of --verbose

``--novf_extended_management``
The inverse of --vf_extended_management

``--novf_management``
The inverse of --vf_management

``--nowatch-log-file``
The inverse of --watch-log-file

@@ -244,12 +236,6 @@ neutron-sanity-check optional arguments
``--version``
show program's version number and exit

``--vf_extended_management``
Check for VF extended management support

``--vf_management``
Check for VF management support

``--watch-log-file``
Uses logging handler designed to watch file system.
When log file is moved or removed this handler will open a new log


+ 0
- 4
neutron/cmd/sanity_check.py View File

@@ -357,7 +357,6 @@ def enable_tests_from_config():
run all necessary tests, just by passing in the appropriate configs.
"""

cfg.CONF.set_default('vf_management', True)
cfg.CONF.set_default('arp_header_match', True)
cfg.CONF.set_default('icmpv6_header_match', True)
if 'vxlan' in cfg.CONF.AGENT.tunnel_types:
@@ -388,9 +387,6 @@ def enable_tests_from_config():
cfg.CONF.set_default('ipset_installed', True)
if cfg.CONF.SECURITYGROUP.enable_security_group:
cfg.CONF.set_default('ip6tables_installed', True)
if ('sriovnicswitch' in cfg.CONF.ml2.mechanism_drivers and
'qos' in cfg.CONF.ml2.extension_drivers):
cfg.CONF.set_default('vf_extended_management', True)
if cfg.CONF.SECURITYGROUP.firewall_driver in (
'iptables',
'iptables_hybrid',


Loading…
Cancel
Save