Skip to content

Commit b95741e

Browse files
committed
missing tgt_type in the master publication translation
1 parent b17c036 commit b95741e

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

salt/master.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,20 +223,22 @@ def _return(self, load):
223223
os.makedirs(hn_dir)
224224
pickle.dump(load['return'], open(os.path.join(hn_dir, 'return.p'), 'w+'))
225225

226-
def publish(self, load):
226+
def publish(self, clear_load):
227227
'''
228228
This method sends out publications to the minions
229229
'''
230-
if not load.pop('key') == self.key:
230+
if not clear_load.pop('key') == self.key:
231231
return ''
232232
jid = self._prep_jid(load)
233233
payload = {'enc': 'aes'}
234234
load = {
235-
'fun': load['fun'],
236-
'arg': load['arg'],
237-
'tgt': load['tgt'],
235+
'fun': clear_load['fun'],
236+
'arg': clear_load['arg'],
237+
'tgt': clear_load['tgt'],
238238
'jid': jid,
239239
}
240+
if clear_load.has_key('tgt_type'):
241+
load['tgt_type'] = clear_load['tgt_type']
240242
payload['load'] = self.crypticle.dumps(load)
241243
self.publisher.publish(salt.payload.package(payload))
242244
return {'enc': 'clear',

0 commit comments

Comments
 (0)