This is an automated email from the ASF dual-hosted git repository.
atkach pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4fb18c7 AMBARI-23259 For Ranger Service /spnego reference principal
is not getting updated in config
4fb18c7 is described below
commit 4fb18c778f0adc0a7c318a9b557010c41b64287e
Author: Andrii Tkach <[email protected]>
AuthorDate: Fri Mar 16 14:52:38 2018 +0200
AMBARI-23259 For Ranger Service /spnego reference principal is not getting
updated in config
---
.../main/admin/kerberos/wizard_controller.js | 17 ++++++++++++-----
ambari-web/app/mixins/wizard/addSecurityConfigs.js | 5 ++++-
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git
a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
index f5b08ed..cb5beea 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
@@ -292,15 +292,22 @@ App.KerberosWizardController =
App.WizardController.extend(App.InstallComponent,
],
'2': [
{
- type: 'sync',
+ type: 'async',
callback: function () {
- var self = this;
- this.loadServiceConfigProperties();
+ const self = this;
+ const dfd = $.Deferred();
+
if (!self.get('stackConfigsLoaded')) {
- App.config.loadConfigsFromStack(['KERBEROS']).complete(function() {
+ App.config.loadConfigsFromStack(['KERBEROS']).always(function() {
+ self.loadServiceConfigProperties();
self.set('stackConfigsLoaded', true);
- }, self);
+ dfd.resolve();
+ });
+ } else {
+ this.loadServiceConfigProperties();
+ dfd.resolve();
}
+ return dfd.promise();
}
}
],
diff --git a/ambari-web/app/mixins/wizard/addSecurityConfigs.js
b/ambari-web/app/mixins/wizard/addSecurityConfigs.js
index bd6fa89..e6a6adb 100644
--- a/ambari-web/app/mixins/wizard/addSecurityConfigs.js
+++ b/ambari-web/app/mixins/wizard/addSecurityConfigs.js
@@ -118,7 +118,10 @@ App.AddSecurityConfigs = Em.Mixin.create({
var defaultObject = {
isConfigIdentity: true,
isOverridable: false,
- isVisible: true,
+ // the user should not be changing the principal name and keytab file
values for identity items
+ // that reference some other identity item,
+ // if an identity entry has a "reference" attribute or the name
attribute starts with a "/"
+ isVisible: !Boolean(identity.reference ||
identity.name.startsWith('/')),
isSecureConfig: true,
serviceName: serviceName,
name: identity.name,
--
To stop receiving notification emails like this one, please contact
[email protected].
