Merge pull request #25525 from gtmanfred/2015.5

add make _prepare an alias for postinitio

salt/daemons/flo/core.py

@@ -134,6 +134,8 @@ class SaltRaetRoadStackSetup(ioflo.base.deeding.Deed):
         RoadStack.Bk = raeting.BodyKind.msgpack.value
         RoadStack.JoinentTimeout = 0.0
 
+    _prepare = postinitio
+
     def action(self):
         '''
         enter action
@@ -237,6 +239,8 @@ class SaltRaetRoadStackJoiner(ioflo.base.deeding.Deed):
         self.masters = daemons.extract_masters(self.opts.value)
         # self.mha = (self.opts.value['master'], int(self.opts.value['master_port']))
 
+    _prepare = postinitio
+
     def action(self, **kwa):
         '''
         Join with all masters
@@ -499,6 +503,8 @@ class SaltLoadModules(ioflo.base.deeding.Deed):
     def postinitio(self):
         self._load_modules()
 
+    _prepare = postinitio
+
     def action(self):
         self._load_modules()
 
@@ -626,6 +632,8 @@ class SaltSchedule(ioflo.base.deeding.Deed):
                 self.modules.value,
                 self.returners.value)
 
+    _prepare = postinitio
+
     def action(self):
         '''
         Eval the schedule
@@ -665,6 +673,8 @@ class SaltRaetManorLaneSetup(ioflo.base.deeding.Deed):
         '''
         pass
 
+    _prepare = postinitio
+
     def action(self):
         '''
         Run once at enter
@@ -1259,6 +1269,8 @@ class SaltRaetMasterEvents(ioflo.base.deeding.Deed):
     def postinitio(self):
         self.master_events.value = deque()
 
+    _prepare = postinitio
+
     def action(self):
         if not self.master_events.value:
             return
@@ -1308,6 +1320,8 @@ class SaltRaetThreadShellJobber(ioflo.base.deeding.Deed):
     def postinitio(self):
         self.threads.value = deque()
 
+    _prepare = postinitio
+
     def action(self):
         '''
         Evaluate the fun options and execute them via salt-call
@@ -1383,6 +1397,8 @@ class SaltRaetNixJobber(ioflo.base.deeding.Deed):
         self.serial = salt.payload.Serial(self.opts)
         self.executors.value = {}
 
+    _prepare = postinitio
+
     def _setup_jobber_stack(self):
         '''
         Setup and return the LaneStack and Yard used by the jobber yard