Repository: ambari Updated Branches: refs/heads/trunk 5711f39c1 -> 5f715c881
AMBARI-17612: Update setup_ranger_plugin_xml for NiFI (jluniya) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5f715c88 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5f715c88 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5f715c88 Branch: refs/heads/trunk Commit: 5f715c881f15f70cedf8397625386ed020ea651e Parents: 5711f39 Author: Jayush Luniya <jlun...@hortonworks.com> Authored: Thu Jul 7 13:00:14 2016 -0700 Committer: Jayush Luniya <jlun...@hortonworks.com> Committed: Thu Jul 7 13:00:14 2016 -0700 ---------------------------------------------------------------------- .../libraries/functions/setup_ranger_plugin_xml.py | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5f715c88/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py b/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py index bd46051..537aaa0 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py @@ -174,9 +174,14 @@ def setup_ranger_plugin_keystore(service_name, audit_db_is_enabled, stack_versio ssl_truststore_password, ssl_keystore_password, component_user, component_group, java_home): stack_root = Script.get_stack_root() + service_name = str(service_name).lower() cred_lib_path = format('{stack_root}/{stack_version}/ranger-{service_name}-plugin/install/lib/*') cred_setup_prefix = (format('{stack_root}/{stack_version}/ranger-{service_name}-plugin/ranger_credential_helper.py'), '-l', cred_lib_path) + if service_name == 'nifi': + cred_lib_path = format('{stack_root}/{stack_version}/{service_name}/ext/ranger/install/lib/*') + cred_setup_prefix = (format('{stack_root}/{stack_version}/{service_name}/ext/ranger/scripts/ranger_credential_helper.py'), '-l', cred_lib_path) + if audit_db_is_enabled: cred_setup = cred_setup_prefix + ('-f', credential_file, '-k', 'auditDBCred', '-v', PasswordString(xa_audit_db_password), '-c', '1') Execute(cred_setup, environment={'JAVA_HOME': java_home}, logoutput=True, sudo=True)
