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

Merge pull request #14611 from SmithSamuelM/sam_2014.7

Browse Source 
Support for updated presence behavior in Raetv0.2.12
This commit is contained in:
Samuel Smith 2014-07-29 15:47:58 -06:00
commit f0a55cf5ca
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -346,6 +346,8 @@ class SaltRaetRoadStackManager(ioflo.base.deeding.Deed):
'ival': odict()}, 'ival': odict()},
aliveds={'ipath': '.salt.var.presence.aliveds', aliveds={'ipath': '.salt.var.presence.aliveds',
'ival': odict()}, 'ival': odict()},
reapeds={'ipath': '.salt.var.presence.reapeds',
'ival': odict()},
availables={'ipath': '.salt.var.presence.availables', availables={'ipath': '.salt.var.presence.availables',
'ival': set()}, 'ival': set()},
changeds={'ipath': '.salt.var.presence.changeds', changeds={'ipath': '.salt.var.presence.changeds',
@ -361,6 +363,7 @@ class SaltRaetRoadStackManager(ioflo.base.deeding.Deed):
minus is set of names of newly unavailable remotes minus is set of names of newly unavailable remotes
alloweds is dict of allowed remotes keyed by name alloweds is dict of allowed remotes keyed by name
aliveds is dict of alived remotes keyed by name aliveds is dict of alived remotes keyed by name
reapeds is dict of reaped remotes keyed by name
''' '''
stack = self.stack.value stack = self.stack.value
if stack and isinstance(stack, RoadStack): if stack and isinstance(stack, RoadStack):
@ -371,21 +374,17 @@ class SaltRaetRoadStackManager(ioflo.base.deeding.Deed):
self.changeds.update(minus=set(self.stack.value.changeds['minus'])) self.changeds.update(minus=set(self.stack.value.changeds['minus']))
self.alloweds.value = odict(self.stack.value.alloweds) self.alloweds.value = odict(self.stack.value.alloweds)
self.aliveds.value = odict(self.stack.value.aliveds) self.aliveds.value = odict(self.stack.value.aliveds)
self.reapeds.value = odict(self.stack.value.reapeds)
console.concise(" Manage {0}.\nAvailables: {1}\nChangeds:\nPlus: {2}\n" console.concise(" Manage {0}.\nAvailables: {1}\nChangeds:\nPlus: {2}\n"
"Minus: {3}\nAlloweds: {4}\nAliveds{5}\n".format( "Minus: {3}\nAlloweds: {4}\nAliveds: {5}\nReapeds: {6}\n".format(
stack.name, stack.name,
self.availables.value, self.availables.value,
self.changeds.data.plus, self.changeds.data.plus,
self.changeds.data.minus, self.changeds.data.minus,
self.alloweds.value, self.alloweds.value,
self.aliveds.value)) self.aliveds.value,
self.reapeds.value))
# share .salt.var.presence.alloweds value is dict keyed by name of allowed remotes
# share .salt.var.presence.changeds has two fields,
# plus is set of newly allowed remotes
# minus is set of newly unallowed remotes
# need to queue presence event message if either plus or minus is not empty # need to queue presence event message if either plus or minus is not empty