summaryrefslogtreecommitdiff
path: root/nova/image/glance.py
diff options
context:
space:
mode:
authorGábor Antal <antal@inf.u-szeged.hu>2016-08-31 18:01:08 +0200
committerGábor Antal <antal@inf.u-szeged.hu>2016-08-31 18:02:02 +0200
commit65b72f2d9d829fa6e0f8ed7bea2fb2831d9ebb8b (patch)
treeb88cb5935fccc4b9c23073cb90813250a61a42ef /nova/image/glance.py
parent5bdf06ea96b168b50b392f4edb8caa6ab6090242 (diff)
downloadnova-65b72f2d9d829fa6e0f8ed7bea2fb2831d9ebb8b.tar.gz
Fixed indentation
At some place of code, wrong indentation is used. In this patchset, I corrected them. Change-Id: I03c7210f2fc90f97be9f09275b0998023303cd5a
Diffstat (limited to 'nova/image/glance.py')
-rw-r--r--nova/image/glance.py34
1 files changed, 17 insertions, 17 deletions
diff --git a/nova/image/glance.py b/nova/image/glance.py
index a90647b2f2..60f27c0ba0 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -84,23 +84,23 @@ def generate_identity_headers(context, status='Confirmed'):
def _glanceclient_from_endpoint(context, endpoint, version=1):
- """Instantiate a new glanceclient.Client object."""
- params = {}
- # NOTE(sdague): even if we aren't using keystone, it doesn't
- # hurt to send these headers.
- params['identity_headers'] = generate_identity_headers(context)
- if endpoint.startswith('https://'):
- # https specific params
- params['insecure'] = CONF.glance.api_insecure
- params['ssl_compression'] = False
- sslutils.is_enabled(CONF)
- if CONF.ssl.cert_file:
- params['cert_file'] = CONF.ssl.cert_file
- if CONF.ssl.key_file:
- params['key_file'] = CONF.ssl.key_file
- if CONF.ssl.ca_file:
- params['cacert'] = CONF.ssl.ca_file
- return glanceclient.Client(str(version), endpoint, **params)
+ """Instantiate a new glanceclient.Client object."""
+ params = {}
+ # NOTE(sdague): even if we aren't using keystone, it doesn't
+ # hurt to send these headers.
+ params['identity_headers'] = generate_identity_headers(context)
+ if endpoint.startswith('https://'):
+ # https specific params
+ params['insecure'] = CONF.glance.api_insecure
+ params['ssl_compression'] = False
+ sslutils.is_enabled(CONF)
+ if CONF.ssl.cert_file:
+ params['cert_file'] = CONF.ssl.cert_file
+ if CONF.ssl.key_file:
+ params['key_file'] = CONF.ssl.key_file
+ if CONF.ssl.ca_file:
+ params['cacert'] = CONF.ssl.ca_file
+ return glanceclient.Client(str(version), endpoint, **params)
def get_api_servers():