You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/03/07 11:57:12 UTC
ambari git commit: AMBARI-9968. Request for Kerberos service check
must be changed (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 61839b3dc -> d451aced8
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/d451aced
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d451aced
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d451aced
Branch: refs/heads/trunk
Commit: d451aced806958611d1539e8696591fee28dc0f2
Parents: 61839b3
Author: Alex Antonenko <hi...@gmail.com>
Authored: Sat Mar 7 01:32:29 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Sat Mar 7 12:56:59 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/d451aced/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/d451aced/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 f572e93..d3adc2a 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)
};
}
},