Increase the default poll duration for Cisco n1kv

Increase the poll duration for Cisco N1Kv, from 10s to 60s and also
clean up the /etc/neutron/plugins/cisco/cisco_plugins.ini file. The
current poll duration of 10s causes that VSM to unnecessarily taking
frequent CPU cycles, resulting in the failure of other tasks in scale
configurations.

Closes-Bug: 1357030

Change-Id: I95747f35bae5b7157391c1698c0fe84d2126aa10

diff --git a/etc/neutron/plugins/cisco/cisco_plugins.ini b/etc/neutron/plugins/cisco/cisco_plugins.ini
index 22c11d4ce92e02a86a1826ce173c2b7c01079684..fdcc8b3668110820c7e59968ee33652f2c16f77b 100644 (file)
--- a/etc/neutron/plugins/cisco/cisco_plugins.ini
+++ b/etc/neutron/plugins/cisco/cisco_plugins.ini
@@ -105,39 +105,34 @@
 
 # (StrOpt) Specify the name of the integration bridge to which the VIFs are
 # attached.
-#
+# Default value: br-int
 # integration_bridge = br-int
 
 # (StrOpt) Name of the policy profile to be associated with a port when no
 # policy profile is specified during port creates.
-#
-# default_policy_profile =
-# Example: default_policy_profile = service_profile
+# Default value: service_profile
+# default_policy_profile = service_profile
 
 # (StrOpt) Name of the policy profile to be associated with a port owned by
 # network node (dhcp, router).
-#
-# network_node_policy_profile =
-# Example: network_node_policy_profile = dhcp_pp
+# Default value: dhcp_pp
+# network_node_policy_profile = dhcp_pp
 
 # (StrOpt) Name of the network profile to be associated with a network when no
 # network profile is specified during network creates. Admin should pre-create
 # a network profile with this name.
-#
-# default_network_profile =
-# Example: default_network_profile = network_pool
+# Default value: default_network_profile
+# default_network_profile = network_pool
 
 # (IntOpt) Time in seconds for which the plugin polls the VSM for updates in
 # policy profiles.
-#
-# poll_duration =
-# Example: poll_duration = 180
+# Default value: 60
+# poll_duration = 60
 
 # (IntOpt) Number of threads to use to make HTTP requests to the VSM.
-#
+# Default value: 4
 # http_pool_size = 4
 
 # (IntOpt) Timeout duration in seconds for the http request
-#
-# http_timeout =
-# Example: http_timeout = 15
+# Default value: 15
+# http_timeout = 15

diff --git a/neutron/plugins/cisco/common/config.py b/neutron/plugins/cisco/common/config.py
index bc764474e0d39eb5655d5879f3acb1c8c65e79e5..c95ce3614e1f0029c1f1aa44e970256d21a22988 100644 (file)
--- a/neutron/plugins/cisco/common/config.py
+++ b/neutron/plugins/cisco/common/config.py
@@ -76,7 +76,7 @@ cisco_n1k_opts = [
                help=_("N1K default policy profile")),
     cfg.StrOpt('network_node_policy_profile', default='dhcp_pp',
                help=_("N1K policy profile for network node")),
-    cfg.IntOpt('poll_duration', default=10,
+    cfg.IntOpt('poll_duration', default=60,
                help=_("N1K Policy profile polling duration in seconds")),
     cfg.IntOpt('http_pool_size', default=4,
                help=_("Number of threads to use to make HTTP requests")),