From 88ce4abfd3b3e3f46dd3d34e2ca48ad72a2bf882 Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Wed, 15 Feb 2017 20:56:44 +0400 Subject: [PATCH] Adding scheme support Change-Id: I9f714875dbc6abf5f8eeef2542e3af0023d000db --- fuel_ccp_entrypoint/start_script.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/fuel_ccp_entrypoint/start_script.py b/fuel_ccp_entrypoint/start_script.py index 3819729..7218d19 100644 --- a/fuel_ccp_entrypoint/start_script.py +++ b/fuel_ccp_entrypoint/start_script.py @@ -551,11 +551,17 @@ def run_probe(probe): if probe["type"] == "exec": run_cmd(probe["command"]) elif probe["type"] == "httpGet": - url = "http://{}:{}{}".format( - VARIABLES["network_topology"]["private"]["address"], - probe["port"], - probe.get("path", "/")) - resp = requests.get(url) + scheme = probe.get("scheme", "http") + kwargs = { + "url": "{}://{}:{}{}".format( + scheme, + VARIABLES["network_topology"]["private"]["address"], + probe["port"], + probe.get("path", "/")) + } + if scheme == "https": + kwargs['cert'] = CACERT + resp = requests.get(**kwargs) resp.raise_for_status()