You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2015/10/30 21:32:57 UTC
ambari git commit: AMBARI-13640. Ranger Quick links not working in
Ranger-admin HA.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk b71d335fb -> 49d3efe7a
AMBARI-13640. Ranger Quick links not working 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/49d3efe7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/49d3efe7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/49d3efe7
Branch: refs/heads/trunk
Commit: 49d3efe7a38e7f239188f0f62dfed1560c874b0e
Parents: b71d335
Author: Xi Wang <xi...@apache.org>
Authored: Thu Oct 29 17:49:28 2015 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Fri Oct 30 13:32:34 2015 -0700
----------------------------------------------------------------------
ambari-web/app/views/common/quick_view_link_view.js | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/49d3efe7/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 c6cff1b..ad03526 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -75,7 +75,7 @@ App.QuickViewLinks = Em.View.extend({
/**
* list of files that contains properties for enabling/disabling ssl
*/
- requiredSiteNames: ['hadoop-env','yarn-env','hbase-env','oozie-env','mapred-env','storm-env', 'falcon-env', 'core-site', 'hdfs-site', 'hbase-site', 'oozie-site', 'yarn-site', 'mapred-site', 'storm-site', 'spark-defaults', 'accumulo-site', 'application-properties', 'ranger-admin-site', 'ranger-site'],
+ requiredSiteNames: ['hadoop-env','yarn-env','hbase-env','oozie-env','mapred-env','storm-env', 'falcon-env', 'core-site', 'hdfs-site', 'hbase-site', 'oozie-site', 'yarn-site', 'mapred-site', 'storm-site', 'spark-defaults', 'accumulo-site', 'application-properties', 'ranger-admin-site', 'ranger-site', 'admin-properties'],
/**
* Get public host name by its host name.
*
@@ -152,6 +152,15 @@ App.QuickViewLinks = Em.View.extend({
} else if (item.get('service_id') === 'MAPREDUCE2') {
siteConfigs = self.get('configProperties').findProperty('type', item.get('site')).properties;
item.set('url', item.get('template').fmt(protocol, siteConfigs[item.get(protocol + '_config')]));
+ } else if (item.get('service_id') === 'RANGER') {
+ siteConfigs = self.get('configProperties').findProperty('type', 'admin-properties').properties;
+ if (siteConfigs['policymgr_external_url']) {
+ // external_url example: "http://c6404.ambari.apache.org:6080"
+ var hostAndPort = siteConfigs['policymgr_external_url'] && siteConfigs['policymgr_external_url'].split('://')[1];
+ item.set('url', protocol + '://' + hostAndPort);
+ } else {
+ item.set('url', item.get('template').fmt(protocol, hosts[0], port));
+ }
} else {
item.set('url', item.get('template').fmt(protocol, hosts[0], port));
}