Repository: ambari Updated Branches: refs/heads/branch-2.4 de64972c9 -> f7578a08d
AMBARI-20926. Ranger Quick links not showing load balancer in Ranger-admin HA. (xwang via yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f7578a08 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f7578a08 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f7578a08 Branch: refs/heads/branch-2.4 Commit: f7578a08d787e4a6265cce72c73d9c0283530718 Parents: de64972 Author: Yusaku Sako <[email protected]> Authored: Fri May 5 10:19:21 2017 -0700 Committer: Yusaku Sako <[email protected]> Committed: Fri May 5 10:19:21 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/f7578a08/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 17d7c04..e9303bc 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.QuickViewLinks = 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'); @@ -354,6 +354,11 @@ App.QuickViewLinks = 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/f7578a08/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 f9a52b1..f715c57 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.QuickViewLinks', 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"]); }); });
