File 0001-fix-dvs-agent-config.patch of Package openstack-neutron-vsphere

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-fix-dvs-agent-config.patch of Package openstack-neutron-vsphere (Revision 54be7bbb7be0556906655c0f5d7f7814)

Currently displaying revision 54be7bbb7be0556906655c0f5d7f7814 , Show latest

commit b44e9ded378ce73645ad824b96cecfbaf143cadf
Author: Stefan Nica <snica@suse.com>
Date:   Mon May 29 12:23:36 2017 +0200

Fix neutron-dvs-agent startup errors
    
    The DVS agent complains about missing L2_AGENT_TOPIC
    constant and report_interval configuration option
    during startup. This changeset corrects these problems.
    
    Closes-Bug: 1694239
    Change-Id: I055bb7057e7ee67ea7dd1d30f4e1fc136b196e61
    (cherry picked from commit 11f75633ef3fd68346be4312943f9478702f8a67)

diff --git a/networking_vsphere/agent/dvs_neutron_agent.py b/networking_vsphere/agent/dvs_neutron_agent.py
index c97a267..a5dedc4 100644
--- a/networking_vsphere/agent/dvs_neutron_agent.py
+++ b/networking_vsphere/agent/dvs_neutron_agent.py
@@ -24,6 +24,7 @@ from oslo_log import log as logging
 import oslo_messaging
 from oslo_service import loopingcall
 
+from neutron_lib import constants as n_const
 from neutron_lib import context
 from neutron_lib.utils import helpers
 
@@ -31,7 +32,7 @@ from neutron.agent.common import polling
 from neutron.agent import rpc as agent_rpc
 from neutron.agent import securitygroups_rpc as sg_rpc
 from neutron.common import config as common_config
-from neutron.common import constants as n_const
+from neutron.common import constants as common_constants
 from neutron.common import topics
 from neutron.common import utils
 
@@ -212,7 +213,7 @@ class DVSAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
             agent_status = self.state_rpc.report_state(self.context,
                                                        self.agent_state,
                                                        True)
-            if agent_status == n_const.AGENT_REVIVED:
+            if agent_status == common_constants.AGENT_REVIVED:
                 LOG.info(_LI('Agent has just revived. Do a full sync.'))
             self.agent_state.pop('start_flag', None)
         except Exception:
diff --git a/networking_vsphere/common/vmware_conf.py b/networking_vsphere/common/vmware_conf.py
index e8aaa69..ceb208d 100644
--- a/networking_vsphere/common/vmware_conf.py
+++ b/networking_vsphere/common/vmware_conf.py
@@ -28,6 +28,9 @@ agent_opts = [
     cfg.IntOpt('polling_interval', default=2,
                help=_("The number of seconds the agent will wait between "
                       "polling for local device changes.")),
+    cfg.IntOpt('report_interval',
+               default=30,
+               help='Seconds between agents reporting state to server.'),
 ]
 
 vmware_opts = [

Places

File 0001-fix-dvs-agent-config.patch of Package openstack-neutron-vsphere (Revision 54be7bbb7be0556906655c0f5d7f7814)

Places