afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add default node map configuration, to avoid the need to set this up every time

Browse source
This commit is contained in:
Blake J. Harnden 2018-01-04 08:19:34 -08:00
parent afb6af5f87
commit 42bcb1c79d
14 changed files with 38 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

7
daemon/sbin/core-daemon
View file

@ -336,17 +336,14 @@ def main():
if __name__ == "__main__":
# configure nodes to use
node_map = nodemaps.NODES
if len(sys.argv) == 2 and sys.argv[1] == "ovs":
from core.netns.openvswitch import OVS_NODES
node_map.update(OVS_NODES)
nodeutils.update_node_map(OVS_NODES)
# update with BSD based nodes
if os.uname()[0] == "FreeBSD":
from core.bsd.nodes import BSD_NODES
node_map.update(BSD_NODES)
nodeutils.set_node_map(node_map)
nodeutils.update_node_map(BSD_NODES)
# load default services
services.load()