openstack/cinder
Code Issues Proposed changes

Merge "[DOC BLD FIX] Fix formatting in cinder.compute.nova"

Browse Source
This commit is contained in:
Jenkins 2017-07-24 20:21:30 +00:00 committed by Gerrit Code Review
commit 020d037671
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cinder/compute/nova.py
View File

@ -107,12 +107,15 @@ def _get_identity_endpoint_from_sc(context):
def novaclient(context, privileged_user=False, timeout=None, api_version=None): def novaclient(context, privileged_user=False, timeout=None, api_version=None):
"""Returns a Nova client """Returns a Nova client
@param privileged_user: If True, use the account from configuration @param privileged_user:
If True, use the account from configuration
(requires 'auth_type' and the other usual Keystone authentication (requires 'auth_type' and the other usual Keystone authentication
options to be set in the [nova] section) options to be set in the [nova] section)
@param timeout: Number of seconds to wait for an answer before raising a @param timeout:
Number of seconds to wait for an answer before raising a
Timeout exception (None to disable) Timeout exception (None to disable)
@param api_version: api version of nova @param api_version:
api version of nova
""" """
if privileged_user and CONF[NOVA_GROUP].auth_type: if privileged_user and CONF[NOVA_GROUP].auth_type: