From 4f96245635fda9206307207e0afc218f80439e46 Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Thu, 10 Nov 2016 20:24:05 +0300 Subject: [PATCH] Few changes to 'address' function for ingress * scheme can be added with with_scheme=True flag * ingress port will be added to the end of the address Change-Id: Iea6b885efdbf0d18268b181007a61dff36b904f0 Depends-On: I94efeea5a8a0acb67781d3e5a50b0c99601f7b4e --- fuel_ccp_entrypoint/start_script.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/fuel_ccp_entrypoint/start_script.py b/fuel_ccp_entrypoint/start_script.py index 78ecdfc..e99906a 100644 --- a/fuel_ccp_entrypoint/start_script.py +++ b/fuel_ccp_entrypoint/start_script.py @@ -205,13 +205,16 @@ def get_ingress_host(ingress_name): ingress_name, VARIABLES['namespace'], VARIABLES['ingress']['domain'])) -def address(service, port=None, external=False): +def address(service, port=None, external=False, with_scheme=False): addr = None + scheme = 'http' if external: if not port: raise RuntimeError('Port config is required for external address') if VARIABLES['ingress']['enabled'] and port.get('ingress'): - addr = get_ingress_host(port['ingress']) + scheme = 'https' + addr = "%s:%s" % (get_ingress_host(port['ingress']), + VARIABLES['ingress']['port']) elif port.get('node'): addr = '%s:%s' % (VARIABLES['k8s_external_ip'], port['node']) @@ -220,6 +223,9 @@ def address(service, port=None, external=False): if port: addr = '%s:%s' % (addr, port['cont']) + if with_scheme: + addr = "%s://%s" % (scheme, addr) + return addr