diff --git a/salt/client.py b/salt/client.py index 7b25c7fda7..ef30fb8689 100644 --- a/salt/client.py +++ b/salt/client.py @@ -64,7 +64,7 @@ class LocalClient(object): Execute a salt command and return. ''' pub_data = self.pub(tgt, fun, arg) - return get_returns(pub_data['jid'], pub_data['minions'], timeout) + return self.get_returns(pub_data['jid'], pub_data['minions'], timeout) def get_returns(self, jid, minions, timeout=5): ''' diff --git a/salt/minion.py b/salt/minion.py index 27e56afa5d..89b2e65494 100644 --- a/salt/minion.py +++ b/salt/minion.py @@ -100,6 +100,19 @@ class Minion(object): ret['jid'] = data['jid'] return ret + def _handle_pub(self, load): + ''' + Handle public key payloads + ''' + pass + + def _handle_clear(self, load): + ''' + Handle unencrypted transmisions + ''' + pass + + def _return_pub(self, ret): ''' Returnt the data from the executed command to the master server