openstack/placement
Code Issues Proposed changes

Merge "Check opt consistency for api.py"

Browse Source
This commit is contained in:
Jenkins
2016-08-10 09:57:33 +00:00
committed by Gerrit Code Review
parent 3d419f2f5a 16df9f824c
commit 9ad4af908b
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
nova/conf/api.py
View File

@@ -1,6 +1,3 @@
# needs:check_opt_group_and_type
# Copyright 2015 OpenStack Foundation # Copyright 2015 OpenStack Foundation
# All Rights Reserved. # All Rights Reserved.
# #
@@ -101,10 +98,6 @@ reference.
A list of vendordata providers, with StaticJSON and DynamicJSON being A list of vendordata providers, with StaticJSON and DynamicJSON being
current options. current options.
* Services that use this:
``nova-api``
* Related options: * Related options:
vendordata_dynamic_targets vendordata_dynamic_targets
@@ -132,10 +125,6 @@ REST services ssl certificates against.
An empty string, or a path to a valid certificate file An empty string, or a path to a valid certificate file
* Services that use this:
``nova-api``
* Related options: * Related options:
vendordata_providers vendordata_providers
@@ -155,10 +144,6 @@ Maximum wait time for an external REST service to connect.
timeout). Note that instance start may be blocked during this wait time, timeout). Note that instance start may be blocked during this wait time,
so this value should be kept small. so this value should be kept small.
* Services that use this:
``nova-api``
* Related options: * Related options:
vendordata_providers vendordata_providers
@@ -168,6 +153,7 @@ Maximum wait time for an external REST service to connect.
"""), """),
cfg.IntOpt('vendordata_dynamic_read_timeout', cfg.IntOpt('vendordata_dynamic_read_timeout',
default=5, default=5,
min=0,
help=""" help="""
Maximum wait time for an external REST service to return data once connected. Maximum wait time for an external REST service to return data once connected.
@@ -176,10 +162,6 @@ Maximum wait time for an external REST service to return data once connected.
Any integer. Note that instance start is blocked during this wait time, Any integer. Note that instance start is blocked during this wait time,
so this value should be kept small. so this value should be kept small.
* Services that use this:
``nova-api``
* Related options: * Related options:
vendordata_providers vendordata_providers