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

Explicitly set raet role

Browse Source
This commit is contained in:
Samuel M Smith 2014-09-17 14:50:02 -06:00
parent ea1aa72115
commit ce54e579e0
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,6 +111,7 @@ class SaltRaetRoadStackSetup(ioflo.base.deeding.Deed):
'main': False,
'mutable': False,
'uid': None,
'role': 'master',
'sigkey': None,
'prikey': None}},
}
@ -130,9 +131,15 @@ class SaltRaetRoadStackSetup(ioflo.base.deeding.Deed):
do salt raet road stack setup at enter
'''
name = self.opts.value.get('id', self.local.data.name)
#import wingdbstub
role = self.opts.value.get('id', self.local.data.role)
sigkey = self.local.data.sigkey
prikey = self.local.data.prikey
#name = self.opts.value.get('id', self.local.data.name)
#name = LocalEstate.nameGuid(prefix='road') # name is guid
#name = 'stack_' + role
name = role
main = self.opts.value.get('raet_main', self.local.data.main)
mutable = self.opts.value.get('raet_mutable', self.local.data.mutable)
always = self.opts.value.get('open_mode', False)
@ -155,6 +162,7 @@ class SaltRaetRoadStackSetup(ioflo.base.deeding.Deed):
name=name,
uid=uid,
ha=ha,
role=role,
sigkey=sigkey,
prikey=prikey,
main=main,

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

@ -2,7 +2,7 @@
house master
init .raet.udp.stack.local to main true name "master"
init .raet.udp.stack.local to main true name "master" role "master"
init .salt.uxd.stack.local to yid 0 name "master" lanename "master"

3
salt/daemons/flo/minion.flo
View File

@ -2,7 +2,8 @@
house minion
init name in .raet.udp.stack.local from value in .salt.etc.id
# init name in .raet.udp.stack.local from value in .salt.etc.id
init role in .raet.udp.stack.local from value in .salt.etc.id
init .salt.uxd.stack.local to yid 0 name "minion" lanename "minion"