openstack
/
horizon
Code Issues Proposed changes

Merge "Respect SSL settings in placement API"

This commit is contained in:
Zuul 2024-04-30 06:52:54 +00:00 committed by Gerrit Code Review
parent 35cbc79da5 14212342cf
commit ab99d768ff
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openstack_dashboard/api/placement.py
View File

@ -10,6 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf import settings
from keystoneauth1 import adapter
from keystoneauth1 import identity
from keystoneauth1 import session
@ -41,7 +42,15 @@ def make_adapter(request):
project_name=request.user.project_name,
project_domain_name=request.user.domain_id,
)
return Adapter(session.Session(auth=auth), api_version="placement 1.6")
verify = True
if settings.OPENSTACK_SSL_NO_VERIFY:
verify = False
elif settings.OPENSTACK_SSL_CACERT:
verify = settings.OPENSTACK_SSL_CACERT
return Adapter(
session.Session(auth=auth, verify=verify),
api_version="placement 1.6",
)
def _get_json(request, path):