openstack
/
manila
Code Issues Proposed changes

Use existing "insecure" options when creating nova/cinder clients 

Change-Id: I49e73e208516df19ba57ea9aa1f5f7b11b07bcb5
Closes-Bug: #1544929
This commit is contained in:
Vincent Untz 2016-02-12 12:19:32 +01:00
parent f858e537dd
commit ef4393aefc
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manila/compute/nova.py
View File

@ -75,6 +75,8 @@ def novaclient(context):
CONF.nova_admin_password,
CONF.nova_admin_tenant_name,
CONF.nova_admin_auth_url,
insecure=CONF.nova_api_insecure,
cacert=CONF.nova_ca_certificates_file,
)
c.authenticate()
return c

4
manila/volume/cinder.py
View File

@ -78,7 +78,9 @@ def cinderclient(context):
CONF.cinder_admin_password,
CONF.cinder_admin_tenant_name,
CONF.cinder_admin_auth_url,
retries=CONF.cinder_http_retries,)
insecure=CONF.cinder_api_insecure,
retries=CONF.cinder_http_retries,
cacert=CONF.cinder_ca_certificates_file)
c.authenticate()
return c