ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject ambari git commit: AMBARI-12988. Kerberos descriptor should be reconfigurable for manual KDC type. (jaimin)
Date Thu, 03 Sep 2015 22:35:01 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 842e221a6 -> e3258f5a3


AMBARI-12988. Kerberos descriptor should be reconfigurable for manual KDC type. (jaimin)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e3258f5a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e3258f5a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e3258f5a

Branch: refs/heads/branch-2.1
Commit: e3258f5a39b3756735d48462ac4e680939f2485b
Parents: 842e221
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Thu Sep 3 15:32:27 2015 -0700
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Thu Sep 3 15:34:38 2015 -0700

----------------------------------------------------------------------
 ambari-web/app/controllers/main/admin/kerberos.js |  8 +++++++-
 ambari-web/app/templates/main/admin/kerberos.hbs  | 14 +++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e3258f5a/ambari-web/app/controllers/main/admin/kerberos.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos.js b/ambari-web/app/controllers/main/admin/kerberos.js
index bbad706..d63b114 100644
--- a/ambari-web/app/controllers/main/admin/kerberos.js
+++ b/ambari-web/app/controllers/main/admin/kerberos.js
@@ -521,7 +521,13 @@ App.MainAdminKerberosController = App.KerberosWizardStep4Controller.extend({
       });
     };
     this.updateKerberosDescriptor(kerberosDescriptor, configs);
-    this.restartServicesAfterRegenerate(false, callback);
+    if (this.get('isManualKerberos')) {
+      callback().done(function () {
+        self.regenerateKeytabsRequest(false,false);
+      });
+    } else {
+      this.restartServicesAfterRegenerate(false, callback);
+    }
   }
 
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/e3258f5a/ambari-web/app/templates/main/admin/kerberos.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/kerberos.hbs b/ambari-web/app/templates/main/admin/kerberos.hbs
index c1e1237..b72627f 100644
--- a/ambari-web/app/templates/main/admin/kerberos.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos.hbs
@@ -24,13 +24,13 @@
           {{#unless isManualKerberos}}
             <button class="btn btn-success" {{bindAttr disabled="isKerberosButtonsDisabled"}}
{{action regenerateKeytabs target="controller"}}>
               <i class="icon-repeat"></i> {{t admin.kerberos.button.regenerateKeytabs}}</button>
-            <br/>
-            {{#unless isEditMode}}
-              <a {{action makeConfigsEditable target="controller"}}
-                      class="pull-right edit-link">
-                {{t common.edit}}
-              </a>
-            {{/unless}}
+          {{/unless}}
+          <br/>
+          {{#unless isEditMode}}
+            <a {{action makeConfigsEditable target="controller"}}
+                    class="pull-right edit-link">
+              {{t common.edit}}
+            </a>
           {{/unless}}
         {{/isAccessible}}
       </p>


Mime
View raw message