This is an automated email from the ASF dual-hosted git repository.
smolnar 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 fbc821d AMBARI-24960. Removing warning about requirement for IPA
password policy (#2657)
fbc821d is described below
commit fbc821def75909d9b621f47c6ec64da54d26ddac
Author: Sandor Molnar <[email protected]>
AuthorDate: Tue Nov 27 20:23:09 2018 +0100
AMBARI-24960. Removing warning about requirement for IPA password policy
(#2657)
---
ambari-web/app/controllers/main/admin/kerberos/step1_controller.js | 3 ---
ambari-web/app/messages.js | 5 ++---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step1_controller.js
b/ambari-web/app/controllers/main/admin/kerberos/step1_controller.js
index b393abe..22c112a 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step1_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step1_controller.js
@@ -92,9 +92,6 @@ App.KerberosWizardStep1Controller = Em.Controller.extend({
}),
PreCondition.create({
displayText:
Em.I18n.t('admin.kerberos.wizard.step1.option.ipa.condition.3')
- }),
- PreCondition.create({
- displayText:
Em.I18n.t('admin.kerberos.wizard.step1.option.ipa.condition.4')
})
]
}),
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index bfcb59d..e793d45 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1332,9 +1332,8 @@ Em.I18n.translations = {
'admin.kerberos.wizard.step1.option.ad.condition.5': 'The Java Cryptography
Extensions (JCE) have been setup on the Ambari Server host and all hosts in the
cluster.',
'admin.kerberos.wizard.step1.option.ipa': 'Existing IPA',
'admin.kerberos.wizard.step1.option.ipa.condition.1': 'All cluster hosts are
joined to the IPA domain and hosts are registered in DNS',
- 'admin.kerberos.wizard.step1.option.ipa.condition.2': 'A password policy is
in place that sets no expiry for created principals',
- 'admin.kerberos.wizard.step1.option.ipa.condition.3': 'If you do not plan on
using Ambari to manage the krb5.conf, ensure the following is set in each
krb5.conf file in your cluster: default_ccache_name = /tmp/krb5cc_%{uid}',
- 'admin.kerberos.wizard.step1.option.ipa.condition.4': 'The Java Cryptography
Extensions (JCE) have been setup on the Ambari Server host and all hosts in the
cluster.',
+ 'admin.kerberos.wizard.step1.option.ipa.condition.2': 'If you do not plan on
using Ambari to manage the krb5.conf, ensure the following is set in each
krb5.conf file in your cluster: default_ccache_name = /tmp/krb5cc_%{uid}',
+ 'admin.kerberos.wizard.step1.option.ipa.condition.3': 'The Java Cryptography
Extensions (JCE) have been setup on the Ambari Server host and all hosts in the
cluster.',
'admin.kerberos.wizard.step1.prerequisites.label': 'Following prerequisites
needs to be checked to progress ahead in the wizard.',
'admin.kerberos.wizard.step2.info.body': 'Please configure kerberos related
properties.',
'admin.kerberos.wizard.step3.task0.title': 'Install Kerberos Client',
