mravi/uncloud
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow non existing configuration file

Browse source 
Fixes #1.
This commit is contained in:
Nico Schottelius 2019-12-07 13:45:01 +01:00
commit 40176d2eaf
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ucloud/config.py
View file

@ -4,10 +4,15 @@ from ucloud.common.host import HostPool
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
from decouple import Config, RepositoryEnv, RepositoryEmpty
env_vars = Config(RepositoryEnv('/etc/ucloud/ucloud.conf'))
# 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 = {