From: Jenkins <jenkins@review.openstack.org>
Date: Sun, 22 Jun 2014 09:17:26 +0000 (+0000)
Subject: Merge "Changing the poll_duration parameter type to int"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6f84275dd9c4de62e839ffe238cbad1b8fb8ed4a;p=openstack-build%2Fneutron-build.git

Merge "Changing the poll_duration parameter type to int"
---

6f84275dd9c4de62e839ffe238cbad1b8fb8ed4a
diff --cc neutron/plugins/cisco/common/config.py
index c3f25093e,255a42d99..f13569cea
--- a/neutron/plugins/cisco/common/config.py
+++ b/neutron/plugins/cisco/common/config.py
@@@ -78,10 -78,8 +78,10 @@@ 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.StrOpt('poll_duration', default='10',
+     cfg.IntOpt('poll_duration', default=10,
                 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")),
  ]
  
  cfg.CONF.register_opts(cisco_opts, "CISCO")