Repository: ambari Updated Branches: refs/heads/branch-2.5 3f5ea585f -> baf8f9afa
AMBARI-20926. Ranger Quick links not showing load balancer in Ranger-admin HA.(xiwang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/baf8f9af Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/baf8f9af Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/baf8f9af Branch: refs/heads/branch-2.5 Commit: baf8f9afa85698f1fdec6342ce777d418be74e78 Parents: 3f5ea58 Author: Xi Wang <[email protected]> Authored: Wed May 3 16:07:42 2017 -0700 Committer: Xi Wang <[email protected]> Committed: Wed May 3 16:07:53 2017 -0700 ---------------------------------------------------------------------- ambari-web/app/views/common/quick_view_link_view.js | 7 ++++++- ambari-web/test/views/common/quick_link_view_test.js | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/baf8f9af/ambari-web/app/views/common/quick_view_link_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/quick_view_link_view.js b/ambari-web/app/views/common/quick_view_link_view.js index 86a7cb9..408c5e5 100644 --- a/ambari-web/app/views/common/quick_view_link_view.js +++ b/ambari-web/app/views/common/quick_view_link_view.js @@ -189,7 +189,7 @@ App.QuickLinksView = Em.View.extend({ if (!Em.isNone(quickLinksConfig)) { var protocolConfig = Em.get(quickLinksConfig, 'protocol'); var checks = Em.get(protocolConfig, 'checks'); - var sites = ['core-site', 'hdfs-site']; + var sites = ['core-site', 'hdfs-site', 'admin-properties']; if (checks) { checks.forEach(function (check) { var protocolConfigSiteProp = Em.get(check, 'site'); @@ -361,6 +361,11 @@ App.QuickLinksView = Em.View.extend({ host = hostObj.Hosts.public_host_name; } } + } else if (serviceName === 'RANGER') { + var siteConfigs = this.get('configProperties').findProperty('type', 'admin-properties').properties; + if (siteConfigs['policymgr_external_url']) { + host = siteConfigs['policymgr_external_url'].split('://')[1].split(':')[0]; + } } var linkPort = this.setPort(Em.get(link, 'port'), protocol, configProperties); http://git-wip-us.apache.org/repos/asf/ambari/blob/baf8f9af/ambari-web/test/views/common/quick_link_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/common/quick_link_view_test.js b/ambari-web/test/views/common/quick_link_view_test.js index 7179078..0904665 100644 --- a/ambari-web/test/views/common/quick_link_view_test.js +++ b/ambari-web/test/views/common/quick_link_view_test.js @@ -205,7 +205,7 @@ describe('App.QuickLinksView', function () { quickViewLinks.set('content.serviceName', 'YARN'); mock.returns(quickLinksConfigYARN); quickViewLinks.loadQuickLinksConfigSuccessCallback({items: []}); - expect(quickViewLinks.get('requiredSiteNames')).to.be.eql(["core-site", "hdfs-site", "hbase-site", "yarn-site"]); + expect(quickViewLinks.get('requiredSiteNames')).to.be.eql(["core-site", "hdfs-site", "admin-properties", "hbase-site", "yarn-site"]); }); });
