Repository: ambari Updated Branches: refs/heads/trunk 80b874004 -> 7fc539ffd
AMBARI-20555. Add Ambari cluster name for Ranger-Tagsync to sync generated atlas tags (Vishal Suvagia via smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7fc539ff Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7fc539ff Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7fc539ff Branch: refs/heads/trunk Commit: 7fc539ffda2158850c7f1c70987e15dbd48162c0 Parents: 80b8740 Author: Sumit Mohanty <[email protected]> Authored: Fri Mar 24 06:53:22 2017 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Fri Mar 24 06:53:28 2017 -0700 ---------------------------------------------------------------------- .../common-services/RANGER/0.4.0/package/scripts/params.py | 5 ++++- .../RANGER/0.7.0/configuration/ranger-tagsync-site.xml | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7fc539ff/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py index 0fae23e..094d239 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py @@ -442,4 +442,7 @@ ranger_truststore_alias = default('/configurations/ranger-admin-site/ranger.trus https_enabled = config['configurations']['ranger-admin-site']['ranger.service.https.attrib.ssl.enabled'] http_enabled = config['configurations']['ranger-admin-site']['ranger.service.http.enabled'] https_keystore_password = config['configurations']['ranger-admin-site']['ranger.service.https.attrib.keystore.pass'] -truststore_password = config['configurations']['ranger-admin-site']['ranger.truststore.password'] \ No newline at end of file +truststore_password = config['configurations']['ranger-admin-site']['ranger.truststore.password'] + +# need this to capture cluster name for ranger tagsync +cluster_name = config['clusterName'] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/7fc539ff/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml b/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml index d186625..6391bd4 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml @@ -31,4 +31,13 @@ <description>Keystore and truststore information used for tagsync, required if tagsync to atlas communication is SSL enabled</description> <on-ambari-upgrade add="false"/> </property> + <property> + <name>ranger.tagsync.atlas.default.cluster.name</name> + <value>{{cluster_name}}</value> + <description>Capture cluster name</description> + <value-attributes> + <empty-value-valid>true</empty-value-valid> + </value-attributes> + <on-ambari-upgrade add="false"/> + </property> </configuration> \ No newline at end of file
