From d08b8c0d1db177f23c6a96edce43b660389c8c7c Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Thu, 22 Mar 2012 11:19:12 -0700 Subject: [PATCH] Resync with devstack.sh, issue #75 --- conf/stack.ini | 3 +++ devstack/components/nova.py | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/conf/stack.ini b/conf/stack.ini index 1a0e24f6..14f65bc8 100644 --- a/conf/stack.ini +++ b/conf/stack.ini @@ -86,6 +86,9 @@ keystone_service_protocol = ${KEYSTONE_SERVICE_PROTOCOL:-http} verbose = ${NOVA_VERBOSE:-1} logdir = ${NOVA_LOGDIR:-/var/log/nova} +# Set api_rate_limit = 0 (or blank) to turn OFF rate limiting +api_rate_limit = ${API_RATE_LIMIT:-1} + # Allow the admin api to be accessible? allow_admin_api = 1 diff --git a/devstack/components/nova.py b/devstack/components/nova.py index e8b687e1..3d98909b 100644 --- a/devstack/components/nova.py +++ b/devstack/components/nova.py @@ -561,6 +561,12 @@ class NovaConfConfigurator(object): # Which scheduler do u want? nova_conf.add('compute_scheduler_driver', self._getstr('scheduler', DEF_SCHEDULER)) + # Rate limit the api?? + if self._getbool('api_rate_limit'): + nova_conf.add('api_rate_limit', str(True)) + else: + nova_conf.add('api_rate_limit', str(False)) + # Setup any network settings self._configure_network_settings(nova_conf)