Browse Source

Merge "Add custom SSL CA Cert support for api.cinder.get_microversion"

changes/39/693139/6
Zuul 2 weeks ago
parent
commit
21306e7cb3
3 changed files with 8 additions and 3 deletions
  1. +1
    -1
      lower-constraints.txt
  2. +6
    -1
      openstack_dashboard/api/cinder.py
  3. +1
    -1
      requirements.txt

+ 1
- 1
lower-constraints.txt View File

@@ -92,7 +92,7 @@ pyOpenSSL==17.1.0
pyparsing==2.1.0
pyperclip==1.5.27
pyScss==1.3.4
python-cinderclient==4.0.1
python-cinderclient==5.0.0
python-dateutil==2.5.3
python-glanceclient==2.8.0
python-keystoneclient==3.15.0

+ 6
- 1
openstack_dashboard/api/cinder.py View File

@@ -274,7 +274,12 @@ def get_microversion(request, features):
continue
else:
return None
min_ver, max_ver = cinder_client.get_server_version(cinder_url)

insecure = settings.OPENSTACK_SSL_NO_VERIFY
cacert = settings.OPENSTACK_SSL_CACERT

min_ver, max_ver = cinder_client.get_server_version(cinder_url,
insecure, cacert)
return microversions.get_microversion_for_features(
'cinder', features, api_versions.APIVersion, min_ver, max_ver)


+ 1
- 1
requirements.txt View File

@@ -31,7 +31,7 @@ osprofiler>=2.3.0 # Apache-2.0
Pint>=0.5 # BSD
pymongo!=3.1,>=3.0.2 # Apache-2.0
pyScss!=1.3.5,>=1.3.4 # MIT License
python-cinderclient>=4.0.1 # Apache-2.0
python-cinderclient>=5.0.0 # Apache-2.0
python-glanceclient>=2.8.0 # Apache-2.0
python-keystoneclient>=3.15.0 # Apache-2.0
python-neutronclient>=6.7.0 # Apache-2.0

Loading…
Cancel
Save