diff --git a/ucloud/config.py b/ucloud/config.py index b8b4dcf..834d51e 100644 --- a/ucloud/config.py +++ b/ucloud/config.py @@ -5,18 +5,14 @@ from ucloud.common.request import RequestPool from ucloud.common.vm import VmPool from ucloud.common.storage_handlers import FileSystemBasedImageStorageHandler, CEPHBasedImageStorageHandler -from decouple import Config, RepositoryEnv, RepositoryEmpty - # Replacing decouple inline import configparser import os import os.path import logging - log = logging.getLogger("ucloud.config") - conf_name = "ucloud.conf" try: @@ -34,14 +30,6 @@ try: except FileNotFoundError: log.warn("Configuration file not found - using defaults") - -# Try importing config, but don't fail if it does not exist -# try: -# env_vars = Config(RepositoryEnv('/etc/ucloud/ucloud.conf')) -# except FileNotFoundError: -# env_vars = Config(RepositoryEmpty()) - - etcd_wrapper_args = () etcd_wrapper_kwargs = { 'host': config['etcd']['ETCD_URL'],