saltmodule

execute/views.py

@@ -225,9 +225,9 @@ def salt_result(request):
         host_str = ",".join(host_list)
         logger.info(host_str)
         if salt_arg == '':
-            result = sapi.remote_noarg_execution(host_str, salt_fun)
+            result = sapi.remote_noarg_execution_notgt(host_str, salt_fun)
         else:
-            result = sapi.remote_execution(host_str, salt_fun, salt_arg)
+            result = sapi.remote_execution_notgt(host_str, salt_fun, salt_arg)
 
         cmd_history = Command_history()
         cmd_history.user = _u

shaker/shaker_core.py

@@ -75,6 +75,16 @@ def remote_noarg_execution(self,tgt,fun):
         except Exception as e:
             pass
         return ret
+    def remote_noarg_execution_notgt(self,tgt,fun):
+        ''' Execute commands without parameters '''
+        params = {'client': 'local', 'tgt': tgt, 'fun': fun, 'expr_form': 'list'}
+        obj = urllib.urlencode(params)
+        content = self.postRequest(obj)
+        try:
+            ret = content['return'][0]
+        except Exception as e:
+            pass
+        return ret
     def remote_execution(self,tgt,fun,arg):
         ''' Command execution with parameters '''
         params = {'client': 'local', 'tgt': tgt, 'fun': fun, 'arg': arg, 'expr_form': 'list'}
@@ -85,6 +95,16 @@ def remote_execution(self,tgt,fun,arg):
         except Exception as e:
             pass
         return ret
+    def remote_execution_notgt(self,tgt,fun,arg):
+        ''' Command execution with parameters '''
+        params = {'client': 'local', 'tgt': tgt, 'fun': fun, 'arg': arg, 'expr_form': 'list'}
+        obj = urllib.urlencode(params)
+        content = self.postRequest(obj)
+        try:
+            ret = content['return'][0]
+        except Exception as e:
+            pass
+        return ret
     def shell_remote_execution(self,tgt,arg):
         ''' Shell command execution with parameters '''
         params = {'client': 'local', 'tgt': tgt, 'fun': 'cmd.run', 'arg': arg, 'expr_form': 'list'}