diff options
author | Alex Shatov <alexs@att.com> | 2018-09-20 15:15:45 -0400 |
---|---|---|
committer | Alex Shatov <alexs@att.com> | 2018-09-20 15:15:45 -0400 |
commit | 209f8239c17c437cd15518ae4c111af4147a6a64 (patch) | |
tree | b347f981de960b3f1d2de7566a3223f72d2efd1e /policyhandler/config.py | |
parent | 2d0b15c1bfc707e37447d4b64686285c1e23c533 (diff) |
4.4.0 policy-handler - configurable consul-url4.4.03.0.1-ONAP3.0.0-ONAPcasablanca
- made consul-url configurable thru env var or local config
consul url is taken from env var $CONSUL_URL
if not provided, then from consul_url in etc/config.json
if not provided, then from hardcoded value of http://consul:8500
- per request from convergence team
- needed to avoid the collision between two consuls provided by
ONAP/OOM/DCAE and cloudify ver >= 4.x
Change-Id: Ic702c872bda3d851842ec41085480a9df200cbde
Signed-off-by: Alex Shatov <alexs@att.com>
Issue-ID: DCAEGEN2-822
Diffstat (limited to 'policyhandler/config.py')
-rw-r--r-- | policyhandler/config.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/policyhandler/config.py b/policyhandler/config.py index a69954f..d94ed79 100644 --- a/policyhandler/config.py +++ b/policyhandler/config.py @@ -24,7 +24,6 @@ import logging import logging.config import os -from .discovery import DiscoveryClient from .onap.audit import Audit from .policy_utils import Utils @@ -134,6 +133,7 @@ class Config(object): SERVICE_NAME_POLICY_HANDLER = "policy_handler" FIELD_SYSTEM = "system" + FIELD_CONSUL_URL = "consul_url" FIELD_WSERVICE_PORT = "wservice_port" FIELD_TLS = "tls" FIELD_POLICY_ENGINE = "policy_engine" @@ -151,6 +151,7 @@ class Config(object): system_name = SERVICE_NAME_POLICY_HANDLER wservice_port = 25577 + consul_url = "http://consul:8500" tls_cacert_file = None tls_server_cert_file = None tls_private_key_file = None @@ -236,6 +237,8 @@ class Config(object): logging.config.dictConfig(logging_config) Config.wservice_port = loaded_config.get(Config.FIELD_WSERVICE_PORT, Config.wservice_port) + Config.consul_url = os.environ.get( + "CONSUL_URL", loaded_config.get(Config.FIELD_CONSUL_URL, Config.consul_url)).rstrip("/") local_config = loaded_config.get(Config.SERVICE_NAME_POLICY_HANDLER, {}) Config.system_name = local_config.get(Config.FIELD_SYSTEM, Config.system_name) @@ -249,6 +252,7 @@ class Config(object): def discover(audit): """bring and merge the config settings from the discovery service""" discovery_key = Config.system_name + from .discovery import DiscoveryClient new_config = DiscoveryClient.get_value(audit, discovery_key) if not new_config or not isinstance(new_config, dict): |