Adding scheme support

Change-Id: I9f714875dbc6abf5f8eeef2542e3af0023d000db
This commit is contained in:
Andrey Pavlov 2017-02-15 20:56:44 +04:00 committed by Sergey Reshetnyak
parent 8ce8d3a31f
commit 23ce98f10c
1 changed files with 11 additions and 13 deletions

View File

@ -558,19 +558,17 @@ def run_probe(probe):
if probe["type"] == "exec":
run_cmd(probe["command"])
elif probe["type"] == "httpGet":
scheme = probe.get('scheme', 'http')
if scheme == 'https':
# disable SSL check for probe request
verify = False
else:
verify = True
url = "{}://{}:{}{}".format(
scheme,
VARIABLES["network_topology"]["private"]["address"],
probe["port"],
probe.get("path", "/"))
resp = requests.get(url, verify=verify)
scheme = probe.get("scheme", "http")
kwargs = {
"url": "{}://{}:{}{}".format(
scheme,
VARIABLES["network_topology"]["private"]["address"],
probe["port"],
probe.get("path", "/"))
}
if scheme == "https":
kwargs['verify'] = CACERT
resp = requests.get(**kwargs)
resp.raise_for_status()