summaryrefslogtreecommitdiffstats
path: root/k8s/configure/configure.py
diff options
context:
space:
mode:
authorMiroslav Los <miroslav.los@pantheon.tech>2019-11-26 14:20:36 +0100
committerMiroslav Los <miroslav.los@pantheon.tech>2019-11-26 19:24:24 +0100
commit01a60ff23b979eb676658713748598ba4892163a (patch)
tree1fb1b260c3723ddc42f047796db6b1928171b48c /k8s/configure/configure.py
parent77e27adeab5ff155b690f2e058c06f0a7812e225 (diff)
Support python3 in all plugins
Unify tox/requirements/setup.py requirement specifications. Do not set upper version limits if possible. Drop uuid as dependency included with standard library. Drop import of unmaintained cloudify_importer without python3 version. Use PEP 508 URLs in requirements for non-PyPI (github) releases. Use cloudify-common 5 release; pre-release package for python3. Rewrite uses of map with loops/comprehensions. Signed-off-by: Miroslav Los <miroslav.los@pantheon.tech> Issue-ID: DCAEGEN2-1956 Change-Id: I7b3ceb97a628e3af5bda3178d182f4207069e86d
Diffstat (limited to 'k8s/configure/configure.py')
-rw-r--r--k8s/configure/configure.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/k8s/configure/configure.py b/k8s/configure/configure.py
index 9f7929e..959c215 100644
--- a/k8s/configure/configure.py
+++ b/k8s/configure/configure.py
@@ -2,6 +2,7 @@
# org.onap.dcae
# ================================================================================
# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019 Pantheon.tech. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -75,13 +76,16 @@ def configure(config_path=_CONFIG_PATH, key = _CONSUL_KEY):
"""
from cloudify.exceptions import NonRecoverableError
- import ConfigParser
+ try:
+ import configparser
+ except ImportError:
+ import ConfigParser as configparser
from k8splugin import discovery
config = _set_defaults()
try:
# Get Consul address from a config file
- c = ConfigParser.ConfigParser()
+ c = configparser.ConfigParser()
c.read(config_path)
config["consul_host"] = c.get('consul','address')