Repository: ambari Updated Branches: refs/heads/branch-2.0.0 913c086a4 -> 64120f35a
AMBARI-9968. Request for Kerberos service check must be changed (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/64120f35 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/64120f35 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/64120f35 Branch: refs/heads/branch-2.0.0 Commit: 64120f35a21ea9d54c1c698832f2fbffa61768c0 Parents: 913c086 Author: Alex Antonenko <[email protected]> Authored: Sat Mar 7 01:32:29 2015 +0200 Committer: Alex Antonenko <[email protected]> Committed: Sat Mar 7 12:58:01 2015 +0200 ---------------------------------------------------------------------- .../main/admin/kerberos/step3_controller.js | 6 +++++- ambari-web/app/utils/ajax/ajax.js | 18 +++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/64120f35/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js index 689ec4f..ef1ef8e 100644 --- a/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js +++ b/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js @@ -78,7 +78,11 @@ App.KerberosWizardStep3Controller = App.KerberosProgressPageController.extend({ 'data': { 'serviceName': this.serviceName, 'displayName': App.format.role(this.serviceName), - 'actionName': this.serviceName + '_SERVICE_CHECK' + 'actionName': this.serviceName + '_SERVICE_CHECK', + 'operationLevel': { + "level": "CLUSTER", + "cluster_name": App.get('clusterName') + } } }); }, http://git-wip-us.apache.org/repos/asf/ambari/blob/64120f35/ambari-web/app/utils/ajax/ajax.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js index a4f4f8f..2804308 100644 --- a/ambari-web/app/utils/ajax/ajax.js +++ b/ambari-web/app/utils/ajax/ajax.js @@ -477,15 +477,19 @@ var urls = { 'real': '/clusters/{clusterName}/requests', 'mock': '/data/wizard/deploy/poll_1.json', 'format': function (data) { + var requestData = { + "RequestInfo": { + "context": data.displayName + " Service Check", + "command": data.actionName + }, + "Requests/resource_filters": [{"service_name": data.serviceName}] + }; + if (data.operationLevel) { + requestData.RequestInfo.operation_level = data.operationLevel; + } return { 'type': 'POST', - data: JSON.stringify({ - "RequestInfo": { - "context": data.displayName + " Service Check", - "command": data.actionName - }, - "Requests/resource_filters": [{"service_name": data.serviceName}] - }) + data: JSON.stringify(requestData) }; } },
