AMBARI-9452 Kerberos: Configure Kerberos page causes confusion. (ababiichuk)

ambari-web/app/data/HDP2/site_properties.js

@@ -1971,18 +1971,6 @@ var hdp2properties = [
     "category": "KDC",
     "index": 1
   },
-  {
-    "id": "puppet var",
-    "name": "admin_server_host",
-    "displayName": "Kadmin host",
-    "isOverridable": false,
-    "isVisible": true,
-    "isRequiredByAgent": true,
-    "serviceName": "KERBEROS",
-    "filename": "krb5-conf.xml",
-    "category": "KDC",
-    "index": 2
-  },
   {
     "id": "puppet var",
     "name": "realm",
@@ -1993,7 +1981,7 @@ var hdp2properties = [
     "serviceName": "KERBEROS",
     "filename": "krb5-conf.xml",
     "category": "KDC",
-    "index": 3
+    "index": 2
   },
   {
     "id": "puppet var",
@@ -2004,7 +1992,7 @@ var hdp2properties = [
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
     "category": "KDC",
-    "index": 4
+    "index": 3
   },
   {
     "id": "puppet var",
@@ -2014,7 +2002,7 @@ var hdp2properties = [
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
     "category": "KDC",
-    "index": 5
+    "index": 4
   },
   {
     "id": "puppet var",
@@ -2036,7 +2024,19 @@ var hdp2properties = [
     "serviceName": "KERBEROS",
     "filename": "krb5-conf.xml",
     "category": "KDC",
-    "index": 6
+    "index": 5
+  },
+  {
+    "id": "puppet var",
+    "name": "admin_server_host",
+    "displayName": "Kadmin host",
+    "isOverridable": false,
+    "isVisible": true,
+    "isRequiredByAgent": true,
+    "serviceName": "KERBEROS",
+    "filename": "krb5-conf.xml",
+    "category": "Kadmin",
+    "index": 0
   },
   {
     "id": "puppet var",
@@ -2048,8 +2048,8 @@ var hdp2properties = [
     "isRequiredByAgent": false,
     "serviceName": "KERBEROS",
     "filename": "krb5-conf.xml",
-    "category": "KDC",
-    "index": 7
+    "category": "Kadmin",
+    "index": 1
   },
   {
     "id": "puppet var",
@@ -2061,8 +2061,8 @@ var hdp2properties = [
     "isRequiredByAgent": false,
     "serviceName": "KERBEROS",
     "filename": "krb5-conf.xml",
-    "category": "KDC",
-    "index": 8
+    "category": "Kadmin",
+    "index": 2
   },
   {
     "id": "puppet var",

ambari-web/app/models/stack_service.js

@@ -169,7 +169,7 @@ App.StackService = DS.Model.extend({
     var configTypes = this.get('configTypes');
     var serviceComponents = this.get('serviceComponents');
     if (configTypes && Object.keys(configTypes).length) {
-      var pattern = ["General", "CapacityScheduler", "FaultTolerance", "Isolation", "Performance", "KDC","^Advanced", "Env$", "^Custom", "Falcon - Oozie integration", "FalconStartupSite", "FalconRuntimeSite", "MetricCollector", "Settings$"];
+      var pattern = ["General", "CapacityScheduler", "FaultTolerance", "Isolation", "Performance", "KDC", "Kadmin","^Advanced", "Env$", "^Custom", "Falcon - Oozie integration", "FalconStartupSite", "FalconRuntimeSite", "MetricCollector", "Settings$"];
       configCategories = App.StackService.configCategories.call(this).filter(function (_configCategory) {
         var serviceComponentName = _configCategory.get('name');
         var isServiceComponent = serviceComponents.someProperty('componentName', serviceComponentName);
@@ -324,7 +324,8 @@ App.StackService.configCategories = function () {
       break;
     case 'KERBEROS':
       serviceConfigCategories.pushObjects([
-        App.ServiceConfigCategory.create({ name: 'KDC', displayName: 'KDC and Kadmin'}),
+        App.ServiceConfigCategory.create({ name: 'KDC', displayName: 'KDC'}),
+        App.ServiceConfigCategory.create({ name: 'Kadmin', displayName: 'Kadmin'}),
         App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'})
       ]);
       break;

ambari-web/app/views/common/controls_view.js

@@ -593,7 +593,7 @@ App.checkConnectionView = App.ServiceConfigTextField.extend({
   didInsertElement: function() {
     this._super();
     var kdc = this.get('categoryConfigsAll').findProperty('name', 'kdc_type');
-    var propertyAppendTo = this.get('categoryConfigsAll').findProperty('name', 'admin_password');
+    var propertyAppendTo = this.get('categoryConfigsAll').findProperty('name', 'domains');
     if (propertyAppendTo) propertyAppendTo.set('additionalView', App.CheckDBConnectionView.extend({databaseName: kdc && kdc.get('value')}));
   }
 });