valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12999 from SmithSamuelM/sam_raet_40

Browse Source 
Updated for RAET v0.0.14
This commit is contained in:
Samuel Smith 2014-05-23 12:09:44 -06:00
commit 141a59a968
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/daemons/flo/core.py
View File

@ -91,6 +91,7 @@ class SaltRaetRoadStack(ioflo.base.deeding.Deed):
local = LocalEstate(
eid=eid,
name=name,
main=main,
ha=ha,
sigkey=sigkey,
prikey=prikey)

2
salt/daemons/flo/master.flo
View File

@ -2,7 +2,7 @@
house master
init .raet.udp.stack.local to eid 1
init .raet.udp.stack.local to eid 1 main true
framer masterudpstack be active first setup
frame setup

6
salt/daemons/test/test_saltsafe.py
View File

@ -221,7 +221,8 @@ class BasicTestCase(unittest.TestCase):
'name': 'main',
'ha': ['0.0.0.0', 7530],
'main': True,
'sid': 0})
'sid': 0,
'neid': 1,})
self.assertDictEqual(main.safe.loadLocalData(), {'prihex': dataMain['prihex'],
'sighex': dataMain['sighex'],
'auto': True})
@ -388,7 +389,8 @@ class BasicTestCase(unittest.TestCase):
'name': 'main',
'ha': ['0.0.0.0', 7530],
'main': True,
'sid': 0})
'sid': 0,
'neid': 1,})
self.assertDictEqual(main.safe.loadLocalData(), {'prihex': dataMain['prihex'],
'sighex': dataMain['sighex'],
'auto': True,})