Merge branch 'master' of code.ungleich.ch:ucloud/ucloud

conf/ucloud.conf

@@ -55,7 +55,3 @@ CEPH_IMG_POOL =
 # Importing uploaded files
 FILE_DIR = /var/lib/ucloud/files
 FILE_PREFIX = noclue-ahmed
-
-[ssh]
-SSH_USERNAME =
-SSH_PRIVATEKEY = 

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'],

ucloud/filescanner/main.py

@@ -6,7 +6,7 @@ import time
 from uuid import uuid4
 
 from . import logger
-from ucloud.config import env_vars, etcd_client
+from ucloud.config import config, etcd_client
 
 
 def getxattr(file, attr):
@@ -69,9 +69,8 @@ except Exception as e:
 
 
 def main():
-    BASE_DIR = env_vars.get("BASE_DIR")
-
-    FILE_PREFIX = env_vars.get("FILE_PREFIX")
+    BASE_DIR    = config['storage']["FILE_DIR"]
+    FILE_PREFIX = config['storage']["FILE_PREFIX"]
 
     # Recursively Get All Files and Folder below BASE_DIR
     files = glob.glob("{}/**".format(BASE_DIR), recursive=True)