From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 29 Aug 2014 09:15:49 +0000 (+0000)
Subject: Merge "Add config for visibility of cisco-policy-profile"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=281491fed788a764f8fab37305f94e21944e1e45;p=openstack-build%2Fneutron-build.git

Merge "Add config for visibility of cisco-policy-profile"
---

281491fed788a764f8fab37305f94e21944e1e45
diff --cc etc/neutron/plugins/cisco/cisco_plugins.ini
index fdcc8b366,0b5a9bf2f..1bfb46dc8
--- a/etc/neutron/plugins/cisco/cisco_plugins.ini
+++ b/etc/neutron/plugins/cisco/cisco_plugins.ini
@@@ -126,11 -129,18 +126,17 @@@
  
  # (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
  
+ # (BoolOpt) Specify whether tenants are restricted from accessing all the
+ # policy profiles.
+ # Default value: False, indicating all tenants can access all policy profiles.
+ #
+ # restrict_policy_profiles = False
+ 
  # (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
diff --cc neutron/plugins/cisco/common/config.py
index c95ce3614,4211400e6..1e844e5df
--- a/neutron/plugins/cisco/common/config.py
+++ b/neutron/plugins/cisco/common/config.py
@@@ -76,8 -76,11 +76,11 @@@ 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.BoolOpt('restrict_policy_profiles', default=False,
+                help=_("Restrict the visibility of policy profiles to the "
+                       "tenants")),
      cfg.IntOpt('http_pool_size', default=4,
                 help=_("Number of threads to use to make HTTP requests")),
      cfg.IntOpt('http_timeout', default=15,