Repository: ambari Updated Branches: refs/heads/branch-2.0.0 0fddaacb5 -> 3f1dad99b
AMBARI-9936. Kerberos wizard: Unable to customize Hbase user and Storm component headless principals. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3f1dad99 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3f1dad99 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3f1dad99 Branch: refs/heads/branch-2.0.0 Commit: 3f1dad99bbaa7c0d58a09186b1f33637816ae7a7 Parents: 0fddaac Author: Jaimin Jetly <[email protected]> Authored: Wed Mar 4 15:07:56 2015 -0800 Committer: Jaimin Jetly <[email protected]> Committed: Wed Mar 4 15:08:55 2015 -0800 ---------------------------------------------------------------------- .../STORM/0.9.1.2.1/kerberos.json | 24 +------------------- .../main/admin/kerberos/step4_controller.js | 23 +++++++++++-------- 2 files changed, 15 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3f1dad99/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/kerberos.json b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/kerberos.json index aa4fa75..50b92ff 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/kerberos.json +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/kerberos.json @@ -107,29 +107,7 @@ ] }, { - "name": "SUPERVISOR", - "identities": [ - { - "name": "storm_components", - "principal": { - "value": "storm@${realm}", - "type": "user", - "configuration": "storm-env/storm_principal_name" - }, - "keytab": { - "file": "${keytab_dir}/storm.service.keytab", - "owner": { - "name": "${storm-env/storm_user}", - "access": "r" - }, - "group": { - "name": "${cluster-env/user_group}", - "access": "" - }, - "configuration": "storm-env/storm_keytab" - } - } - ] + "name" : "SUPERVISOR" } ] } http://git-wip-us.apache.org/repos/asf/ambari/blob/3f1dad99/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js index 06208ee..064eafc 100644 --- a/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js +++ b/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js @@ -52,27 +52,32 @@ App.KerberosWizardStep4Controller = App.WizardStep7Controller.extend(App.AddSecu createServiceConfig: function(configs) { // Identity configs related to user principal var clusterConfigs = configs.filterProperty('serviceName','Cluster'); - var nonClusterConfigs = configs.rejectProperty('serviceName','Cluster'); - var categoryForClusterConfigs = [ + // storm user principal is not required for ambari operation + var userConfigs = configs.filterProperty('identityType','user').rejectProperty('serviceName','STORM'); + var generalConfigs = clusterConfigs.concat(userConfigs).uniq('name'); + var advancedConfigs = configs.filter(function(element){ + return !generalConfigs.findProperty('name', element.get('name')); + }); + var categoryForGeneralConfigs = [ App.ServiceConfigCategory.create({ name: 'Global', displayName: 'Global'}), App.ServiceConfigCategory.create({ name: 'Ambari Principals', displayName: 'Ambari Principals'}) ]; - var categoryForNonClusterConfigs = this.createCategoryForServices(); + var categoryForAdvancedConfigs = this.createCategoryForServices(); return [ App.ServiceConfig.create({ displayName: 'General', name: 'GENERAL', serviceName: 'KERBEROS_GENERAL', - configCategories: categoryForClusterConfigs, - configs: clusterConfigs, + configCategories: categoryForGeneralConfigs, + configs: generalConfigs, showConfig: true }), App.ServiceConfig.create({ displayName: 'Advanced', name: 'ADVANCED', serviceName: 'KERBEROS_ADVANCED', - configCategories: categoryForNonClusterConfigs, - configs: nonClusterConfigs, + configCategories: categoryForAdvancedConfigs, + configs: advancedConfigs, showConfig: true }) ]; @@ -170,8 +175,8 @@ App.KerberosWizardStep4Controller = App.WizardStep7Controller.extend(App.AddSecu else { property.set('category', property.get('serviceName')); } - // All user identity should be grouped under "Ambari Principals" category - if (property.get('identityType') == 'user') property.set('category', 'Ambari Principals'); + // All user identity except storm should be grouped under "Ambari Principals" category + if (property.get('identityType') == 'user' && property.get('serviceName') !== 'STORM') property.set('category', 'Ambari Principals'); var siteProperty = siteProperties.findProperty('name', property.get('name')); if (siteProperty) { if (siteProperty.category === property.get('category')) {
