diff options
| author | Jitendra Nath Pandey <jitendra@apache.org> | 2012-10-12 02:03:57 +0000 |
|---|---|---|
| committer | Jitendra Nath Pandey <jitendra@apache.org> | 2012-10-12 02:03:57 +0000 |
| commit | 5bfc4a8b9bdc1e10fefd30bc54baa3e5b619f705 (patch) | |
| tree | e4d10e9fd5cf12914f74e0ef3f4a1197f9a7d466 /ambari-agent | |
| parent | 27d96c9c8c6cf2fd76795c39b23c7c19e424801c (diff) | |
AMBARI-850. Flatten execution command structure.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/AMBARI-666@1397417 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'ambari-agent')
| -rw-r--r-- | ambari-agent/src/main/python/ambari_agent/ActionQueue.py | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py index f2e3969222..a637b84f4c 100644 --- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py +++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py @@ -106,22 +106,23 @@ class ActionQueue(threading.Thread): clusterName = command['clusterName'] commandId = command['commandId'] hostname = command['hostname'] - params = command['params'] + params = command['hostLevelParams'] clusterHostInfo = command['clusterHostInfo'] - roleCommands = command['roleCommands'] + roleCommand = command['roleCommand'] + serviceName = command['serviceName'] configurations = command['configurations'] result = [] - for roleCommand in roleCommands: - # assume some puppet pluing to run these commands - roleResult = {'role' : roleCommand['role'], - 'actionId' : commandId, - 'stdout' : "DONE", - 'clusterName' : clusterName, - 'stderr' : "DONE", - 'exitCode' : 0, - 'status' : "COMPLETED"} - result.append(roleResult) - pass + # assume some puppet pluing to run these commands + roleResult = {'role' : command['role'], + 'actionId' : commandId, + 'stdout' : "DONE", + 'clusterName' : clusterName, + 'stderr' : "DONE", + 'exitCode' : 0, + 'serviceName' : serviceName, + 'status' : "COMPLETED"} + result.append(roleResult) + pass return result def noOpCommand(self, command): |