Added --conf-dir, --etcd-{host,port,ca_cert,cert_cert,cert_key} parameters to cli and settings is now accessbile through uncloud.shared.shared.settings

uncloud/common/settings.py

@@ -8,6 +8,7 @@ from uncloud.common.etcd_wrapper import Etcd3Wrapper
 from os.path import join as join_path
 
 logger = logging.getLogger(__name__)
+settings = None
 
 
 class CustomConfigParser(configparser.RawConfigParser):
@@ -25,9 +26,8 @@ class CustomConfigParser(configparser.RawConfigParser):
 
 
 class Settings(object):
-    def __init__(self):
+    def __init__(self, conf_dir, seed_value=None):
         conf_name = 'uncloud.conf'
-        conf_dir = os.environ.get('UCLOUD_CONF_DIR', os.path.expanduser('~/uncloud/'))
         self.config_file = join_path(conf_dir, conf_name)
 
         # this is used to cache config from etcd for 1 minutes. Without this we
@@ -38,15 +38,19 @@ class Settings(object):
         self.config_parser.add_section('etcd')
         self.config_parser.set('etcd', 'base_prefix', '/')
 
-        try:
+        if os.access(self.config_file, os.R_OK):
             self.config_parser.read(self.config_file)
-        except Exception as err:
-            logger.error('%s', err)
-
+        else:
+            raise FileNotFoundError('Config file %s not found!', self.config_file)
         self.config_key = join_path(self['etcd']['base_prefix'] + 'uncloud/config/')
 
         self.read_internal_values()
 
+        if seed_value is None:
+            seed_value = dict()
+
+        self.config_parser.read_dict(seed_value)
+
     def get_etcd_client(self):
         args = tuple()
         try:
@@ -128,4 +132,5 @@ class Settings(object):
         return self.config_parser[key]
 
 
-settings = Settings()
+def get_settings():
+    return settings