-src_path = '/etc/invirt/master.yaml'
-cache_path = '/var/lib/invirt/cache.json'
-lock_path = '/var/lib/invirt/cache.lock'
+src_path = '/etc/invirt/master.yaml'
+src_dirpath = '/etc/invirt/conf.d'
+cache_path = '/var/lib/invirt/cache.json'
+lock_path = '/var/lib/invirt/cache.lock'
+
+def augment(d1, d2):
+ """Splice dict-tree d2 into d1. Return d1.
+
+ Example:
+ >>> d = {'a': {'b': 1}, 'c': 2}
+ >>> augment(d, {'a': {'d': 3}})
+ {'a': {'b', 1, 'd': 3}, 'c': 2}
+ >>> d
+ {'a': {'b', 1, 'd': 3}, 'c': 2}
+ """
+ for k in d2:
+ if k in d1 and isinstance(d1[k], dict):
+ augment(d1[k], d2[k])
+ else:
+ d1[k] = d2[k]
+ return d1
+
+def list_files():
+ yield src_path
+ for name in os.listdir(src_dirpath):
+ yield os.path.join(src_dirpath, name)