AMBARI-22412. Remove IPA integration from experimental status (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/22b2d55f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/22b2d55f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/22b2d55f Branch: refs/heads/branch-feature-AMBARI-22008 Commit: 22b2d55f646ebd965834e43536056c5f229e236e Parents: 98915a1 Author: Robert Levas <rle...@hortonworks.com> Authored: Fri Nov 10 10:46:01 2017 -0500 Committer: Robert Levas <rle...@hortonworks.com> Committed: Fri Nov 10 10:46:01 2017 -0500 ---------------------------------------------------------------------- ambari-web/app/config.js | 1 - .../main/admin/kerberos/step1_controller.js | 52 +++++++++----------- ambari-web/app/messages.js | 2 +- .../admin/kerberos/step1_controller_test.js | 17 ------- 4 files changed, 23 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/22b2d55f/ambari-web/app/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js index 0963f70..8dbbde3 100644 --- a/ambari-web/app/config.js +++ b/ambari-web/app/config.js @@ -82,7 +82,6 @@ App.supports = { serviceAutoStart: true, logSearch: true, redhatSatellite: false, - enableIpa: false, addingNewRepository: false, kerberosStackAdvisor: true, logCountVizualization: false, http://git-wip-us.apache.org/repos/asf/ambari/blob/22b2d55f/ambari-web/app/controllers/main/admin/kerberos/step1_controller.js ---------------------------------------------------------------------- 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 2e41e3d..9c864a8 100644 --- a/ambari-web/app/controllers/main/admin/kerberos/step1_controller.js +++ b/ambari-web/app/controllers/main/admin/kerberos/step1_controller.js @@ -25,29 +25,6 @@ App.KerberosWizardStep1Controller = Em.Controller.extend({ isSubmitDisabled: Em.computed.someBy('selectedOption.preConditions', 'checked', false), - ipaOption: Em.Object.create({ - displayName: Em.I18n.t('admin.kerberos.wizard.step1.option.ipa'), - value: Em.I18n.t('admin.kerberos.wizard.step1.option.ipa'), - preConditions: [ - Em.Object.create({ - displayText: Em.I18n.t('admin.kerberos.wizard.step1.option.ipa.condition.1'), - checked: false - }), - Em.Object.create({ - displayText: Em.I18n.t('admin.kerberos.wizard.step1.option.ipa.condition.2'), - checked: false - }), - Em.Object.create({ - displayText: Em.I18n.t('admin.kerberos.wizard.step1.option.ipa.condition.3'), - checked: false - }), - Em.Object.create({ - displayText: Em.I18n.t('admin.kerberos.wizard.step1.option.ipa.condition.4'), - checked: false - }) - ] - }), - options: Em.A([ Em.Object.create({ displayName: Em.I18n.t('admin.kerberos.wizard.step1.option.kdc'), @@ -94,6 +71,28 @@ App.KerberosWizardStep1Controller = Em.Controller.extend({ ] }), Em.Object.create({ + displayName: Em.I18n.t('admin.kerberos.wizard.step1.option.ipa'), + value: Em.I18n.t('admin.kerberos.wizard.step1.option.ipa'), + preConditions: [ + Em.Object.create({ + displayText: Em.I18n.t('admin.kerberos.wizard.step1.option.ipa.condition.1'), + checked: false + }), + Em.Object.create({ + displayText: Em.I18n.t('admin.kerberos.wizard.step1.option.ipa.condition.2'), + checked: false + }), + Em.Object.create({ + displayText: Em.I18n.t('admin.kerberos.wizard.step1.option.ipa.condition.3'), + checked: false + }), + Em.Object.create({ + displayText: Em.I18n.t('admin.kerberos.wizard.step1.option.ipa.condition.4'), + checked: false + }) + ] + }), + Em.Object.create({ displayName: Em.I18n.t('admin.kerberos.wizard.step1.option.manual'), value: Em.I18n.t('admin.kerberos.wizard.step1.option.manual'), preConditions: [ @@ -135,13 +134,6 @@ App.KerberosWizardStep1Controller = Em.Controller.extend({ loadStep: function () { - if (App.get('supports.enableIpa')) { - var ipaOption = this.get('ipaOption'); - var options = this.get('options'); - if (options.indexOf(ipaOption) === -1){ - options.pushObject(ipaOption); - } - } }, submit: function () { http://git-wip-us.apache.org/repos/asf/ambari/blob/22b2d55f/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index bee581a..390f803 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1273,7 +1273,7 @@ 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': '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 in place that sets no expiry for created principals or krbPasswordExpiry attribute is writable', + 'admin.kerberos.wizard.step1.option.ipa.condition.2': 'A password policy in place that sets no expiry for created principals', 'admin.kerberos.wizard.step1.option.ipa.condition.3': 'The ipa managed krb5.conf sets 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.prerequisites.label': 'Following prerequisites needs to be checked to progress ahead in the wizard.', http://git-wip-us.apache.org/repos/asf/ambari/blob/22b2d55f/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js b/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js index ca80341..e5a185e 100644 --- a/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js +++ b/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js @@ -46,23 +46,6 @@ describe('App.KerberosWizardStep1Controller', function() { controller.set('options', []); }); - it("enableIpa is true", function() { - App.set('supports.enableIpa', true); - controller.loadStep(); - expect(controller.get('selectedItem')).to.be.equal(Em.I18n.t('admin.kerberos.wizard.step1.option.kdc')); - expect(controller.get('options')).to.not.be.empty; - controller.loadStep(); - var options = controller.get('options'); - expect(options.length).to.be.equal(1); - }); - - it("enableIpa is false", function() { - App.set('supports.enableIpa', false); - controller.loadStep(); - expect(controller.get('selectedItem')).to.be.equal(Em.I18n.t('admin.kerberos.wizard.step1.option.kdc')); - expect(controller.get('options')).to.be.empty; - }); - it("on load selected item should not change", function() { controller.set('selectedItem',Em.I18n.t('admin.kerberos.wizard.step3.option.kdc')); controller.loadStep();