Browse Source

Merge "Fix neutron-dvs-agent startup errors"

Zuul 10 months ago
parent
commit
34a00a5241

+ 1
- 1
networking_vsphere/agent/dvs_neutron_agent.py View File

@@ -24,6 +24,7 @@ from oslo_log import log as logging
24 24
 import oslo_messaging
25 25
 from oslo_service import loopingcall
26 26
 
27
+from neutron_lib import constants as n_const
27 28
 from neutron_lib import context
28 29
 from neutron_lib.utils import helpers
29 30
 
@@ -32,7 +33,6 @@ from neutron.agent import rpc as agent_rpc
32 33
 from neutron.agent import securitygroups_rpc as sga_rpc
33 34
 from neutron.api.rpc.handlers import securitygroups_rpc as sg_rpc
34 35
 from neutron.common import config as common_config
35
-from neutron.common import constants as n_const
36 36
 from neutron.common import utils
37 37
 from neutron_lib.agent import topics
38 38
 

+ 3
- 0
networking_vsphere/common/vmware_conf.py View File

@@ -28,6 +28,9 @@ agent_opts = [
28 28
     cfg.IntOpt('polling_interval', default=2,
29 29
                help=_("The number of seconds the agent will wait between "
30 30
                       "polling for local device changes.")),
31
+    cfg.IntOpt('report_interval',
32
+               default=30,
33
+               help='Seconds between agents reporting state to server.'),
31 34
 ]
32 35
 
33 36
 vmware_opts = [

Loading…
Cancel
Save