Merge "Move register_opts from pci to manager module"
This commit is contained in:
commit
5b9a924ff8
@ -96,9 +96,16 @@ audit_intervals_opts = [
|
|||||||
cfg.IntOpt('lldp_audit', default=300)
|
cfg.IntOpt('lldp_audit', default=300)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
dpdk_opts = [
|
||||||
|
cfg.StrOpt('dpdk_elf',
|
||||||
|
default='/usr/sbin/ovs-vswitchd',
|
||||||
|
help='DPDK ELF file used for compatibility checks'),
|
||||||
|
]
|
||||||
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
CONF.register_opts(agent_opts, 'agent')
|
CONF.register_opts(agent_opts, 'agent')
|
||||||
CONF.register_opts(audit_intervals_opts, 'agent_periodic_task_intervals')
|
CONF.register_opts(audit_intervals_opts, 'agent_periodic_task_intervals')
|
||||||
|
CONF.register_opts(dpdk_opts, 'dpdk')
|
||||||
|
|
||||||
MAXSLEEP = 600 # 10 minutes
|
MAXSLEEP = 600 # 10 minutes
|
||||||
|
|
||||||
|
@ -24,15 +24,7 @@ from sysinv.common import constants
|
|||||||
from sysinv.common import device as dconstants
|
from sysinv.common import device as dconstants
|
||||||
from sysinv.common import utils
|
from sysinv.common import utils
|
||||||
|
|
||||||
dpdk_opts = [
|
|
||||||
cfg.StrOpt('dpdk_elf',
|
|
||||||
default='/usr/sbin/ovs-vswitchd',
|
|
||||||
help='DPDK ELF file used for compatibility checks'),
|
|
||||||
]
|
|
||||||
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
CONF.register_opts(dpdk_opts, 'dpdk')
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
# Look for PCI class 0x0200 and 0x0280 so that we get generic ethernet
|
# Look for PCI class 0x0200 and 0x0280 so that we get generic ethernet
|
||||||
|
Loading…
Reference in New Issue
Block a user