scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-12-25 17:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

The system configuration is now a heirarchical merge of the sorted files in /etc/onl/config.

Browse Source 
The only required file is the existing 00-defaults.yml
This commit is contained in:
Jeffrey Townsend
2016-06-02 19:34:18 +00:00
parent d2f0cf340d
commit f34662cb60
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/base/all/vendor-config-onl/src/python/onl/sysconfig/__init__.py
View File

@@ -8,6 +8,7 @@ import sys
import yaml
import types
import onl.onlyaml
import onl.util
import platform as pp
from onl.platform.current import OnlPlatform
@@ -43,12 +44,10 @@ class OnlSystemConfig(object):
armv7l='armel')[pp.machine()]
self.config = {}
for root, dirs, files in os.walk(self.SYSTEM_CONFIG_DIR):
for f in files:
if f.endswith('.yml'):
d = onl.onlyaml.loadf(os.path.join(root, f), self.variables)
self.config.update(d)
for f in sorted(os.listdir(self.SYSTEM_CONFIG_DIR)):
if f.endswith('.yml'):
d = onl.onlyaml.loadf(os.path.join(self.SYSTEM_CONFIG_DIR, f), self.variables)
self.config = onl.util.dmerge(self.config, d)
self.config['pc'] = platform.platform_config