From 2269d869cd9a67a44b7d221210404b2378073572 Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Sun, 23 Oct 2016 21:14:50 +0300 Subject: [PATCH] Removing k8s_name function as it's not needed Change-Id: I0e03c471315444e8b53202189047fbbfd2fd4c6f --- fuel_ccp/common/utils.py | 4 ---- fuel_ccp/templates.py | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/fuel_ccp/common/utils.py b/fuel_ccp/common/utils.py index da674b32..fcaf84db 100644 --- a/fuel_ccp/common/utils.py +++ b/fuel_ccp/common/utils.py @@ -16,10 +16,6 @@ CONF = config.CONF LOG = logging.getLogger(__name__) -def k8s_name(*args): - return "-".join(tuple(args)).replace("_", "-") - - def get_resource_path(path): return pkg_resources.resource_filename(fuel_ccp.version_info.package, path) diff --git a/fuel_ccp/templates.py b/fuel_ccp/templates.py index d53051cb..0fe4a672 100644 --- a/fuel_ccp/templates.py +++ b/fuel_ccp/templates.py @@ -1,6 +1,5 @@ import json -from fuel_ccp.common import utils from fuel_ccp import config from fuel_ccp.config import images @@ -361,7 +360,7 @@ def serialize_service(name, ports): spec_entry = {"protocol": "TCP", "port": port["port"], "targetPort": port["port"], - "name": utils.k8s_name(port["name"])} + "name": port["name"]} if port.get("node-port"): spec_entry.update({"nodePort": port["node-port"]}) ports_spec.append(spec_entry)