Merge pull request #132 from harlowja/master

Resynch with v1.
This commit is contained in:
Joshua Harlow 2012-03-22 11:21:40 -07:00
commit 5d7753c199
2 changed files with 9 additions and 0 deletions
conf
devstack/components

@ -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

@ -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)