You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2015/09/04 00:33:31 UTC
ambari git commit: AMBARI-12988. Kerberos descriptor should be
reconfigurable for manual KDC type. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 7871a3292 -> 0e5d3fe73
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/0e5d3fe7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0e5d3fe7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0e5d3fe7
Branch: refs/heads/trunk
Commit: 0e5d3fe73cb6e385a91ecf6a9c510fa169ce31df
Parents: 7871a32
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Thu Sep 3 15:32:27 2015 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Thu Sep 3 15:32:27 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/0e5d3fe7/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 2336708..7730d71 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/0e5d3fe7/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>