openstack
/
mistral
Code Issues Proposed changes

Merge "detect https and act accordingly"

This commit is contained in:
Zuul 2018-07-09 13:12:35 +00:00 committed by Gerrit Code Review
parent aa7b5d9fc0 5cfaa9ca06
commit e2a658a53d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mistral/actions/std_actions.py
View File

@ -190,6 +190,12 @@ class HTTPAction(actions.Action):
)
try:
url_data = six.moves.urllib.parse.urlsplit(self.url)
if 'https' == url_data.scheme:
action_verify = self.verify
else:
action_verify = None
resp = requests.request(
self.method,
self.url,
@ -201,7 +207,7 @@ class HTTPAction(actions.Action):
timeout=self.timeout,
allow_redirects=self.allow_redirects,
proxies=self.proxies,
verify=self.verify
verify=action_verify
)
except Exception as e:
LOG.exception(