This is an automated email from the ASF dual-hosted git repository. mugdha pushed a commit to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push: new 9be0593 AMBARI-22951 Export JAVA_HOME env variable in shell script for Ranger (mugdha) (#2023) 9be0593 is described below commit 9be05937acf2fa57c1d562793a668ad7552d80fb Author: Mugdha Varadkar <fimug...@users.noreply.github.com> AuthorDate: Fri Aug 10 18:44:33 2018 +0530 AMBARI-22951 Export JAVA_HOME env variable in shell script for Ranger (mugdha) (#2023) --- .../RANGER/0.4.0/package/scripts/setup_ranger_xml.py | 7 +++++++ .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 7 +++++++ .../src/test/python/stacks/2.5/RANGER/test_ranger_admin.py | 14 ++++++++++++++ .../test/python/stacks/2.5/RANGER_KMS/test_kms_server.py | 14 ++++++++++++++ .../src/test/python/stacks/2.6/RANGER/test_ranger_admin.py | 14 ++++++++++++++ 5 files changed, 56 insertions(+) diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py index 815e647..398ecf9 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py +++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py @@ -120,6 +120,13 @@ def setup_ranger_admin(upgrade_type=None): create_parents=True ) + File(format('{ranger_conf}/ranger-admin-env.sh'), + content = format("export JAVA_HOME={java_home}"), + owner = params.unix_user, + group = params.unix_group, + mode = 0755 + ) + if params.stack_supports_pid: File(format('{ranger_conf}/ranger-admin-env-piddir.sh'), content = format("export RANGER_PID_DIR_PATH={ranger_pid_dir}\nexport RANGER_USER={unix_user}"), diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py index c0d5aa1..60a51f4 100755 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py @@ -235,6 +235,13 @@ def kms(upgrade_type=None): create_parents=True ) + File(format('{kms_conf_dir}/ranger-kms-env.sh'), + content = format("export JAVA_HOME={java_home}"), + owner = params.kms_user, + group = params.kms_group, + mode = 0755 + ) + if params.stack_supports_pid: File(format('{kms_conf_dir}/ranger-kms-env-piddir.sh'), content = format("export RANGER_KMS_PID_DIR_PATH={ranger_kms_pid_dir}\nexport KMS_USER={kms_user}"), diff --git a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py b/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py index ed97493..ba56b34 100644 --- a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py +++ b/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py @@ -265,6 +265,13 @@ class TestRangerAdmin(RMFTestCase): create_parents=True ) + self.assertResourceCalled('File', '/usr/hdp/current/ranger-admin/conf/ranger-admin-env.sh', + content = 'export JAVA_HOME=/usr/jdk64/jdk1.7.0_45', + owner = 'ranger', + group = 'ranger', + mode = 0755 + ) + self.assertResourceCalled('File', '/usr/hdp/current/ranger-admin/conf/ranger-admin-env-piddir.sh', content = 'export RANGER_PID_DIR_PATH=/var/run/ranger\nexport RANGER_USER=ranger', owner = 'ranger', @@ -429,6 +436,13 @@ class TestRangerAdmin(RMFTestCase): create_parents=True ) + self.assertResourceCalled('File', '/usr/hdp/current/ranger-admin/conf/ranger-admin-env.sh', + content = 'export JAVA_HOME=/usr/jdk64/jdk1.7.0_45', + owner = 'ranger', + group = 'ranger', + mode = 0755 + ) + self.assertResourceCalled('File', '/usr/hdp/current/ranger-admin/conf/ranger-admin-env-piddir.sh', content = 'export RANGER_PID_DIR_PATH=/var/run/ranger\nexport RANGER_USER=ranger', owner = 'ranger', diff --git a/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py b/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py index 201a303..8517785 100644 --- a/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py +++ b/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py @@ -368,6 +368,13 @@ class TestRangerKMS(RMFTestCase): create_parents=True ) + self.assertResourceCalled('File', '/usr/hdp/current/ranger-kms/conf/ranger-kms-env.sh', + content = 'export JAVA_HOME=/usr/jdk64/jdk1.7.0_45', + owner = 'kms', + group = 'kms', + mode = 0755 + ) + self.assertResourceCalled('File', '/usr/hdp/current/ranger-kms/conf/ranger-kms-env-piddir.sh', content = 'export RANGER_KMS_PID_DIR_PATH=/var/run/ranger_kms\nexport KMS_USER=kms', owner = 'kms', @@ -819,6 +826,13 @@ class TestRangerKMS(RMFTestCase): create_parents=True ) + self.assertResourceCalled('File', '/usr/hdp/current/ranger-kms/conf/ranger-kms-env.sh', + content = 'export JAVA_HOME=/usr/jdk64/jdk1.7.0_45', + owner = 'kms', + group = 'kms', + mode = 0755 + ) + self.assertResourceCalled('File', '/usr/hdp/current/ranger-kms/conf/ranger-kms-env-piddir.sh', content = 'export RANGER_KMS_PID_DIR_PATH=/var/run/ranger_kms\nexport KMS_USER=kms', owner = 'kms', diff --git a/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py b/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py index ac24afd..8ab74f5 100644 --- a/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py +++ b/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py @@ -308,6 +308,13 @@ class TestRangerAdmin(RMFTestCase): create_parents=True ) + self.assertResourceCalled('File', '/usr/hdp/current/ranger-admin/conf/ranger-admin-env.sh', + content = 'export JAVA_HOME=/usr/jdk64/jdk1.7.0_45', + owner = 'ranger', + group = 'ranger', + mode = 0755 + ) + self.assertResourceCalled('File', '/usr/hdp/current/ranger-admin/conf/ranger-admin-env-piddir.sh', content = 'export RANGER_PID_DIR_PATH=/var/run/ranger\nexport RANGER_USER=ranger', owner = 'ranger', @@ -488,6 +495,13 @@ class TestRangerAdmin(RMFTestCase): create_parents=True ) + self.assertResourceCalled('File', '/usr/hdp/current/ranger-admin/conf/ranger-admin-env.sh', + content = 'export JAVA_HOME=/usr/jdk64/jdk1.7.0_45', + owner = 'ranger', + group = 'ranger', + mode = 0755 + ) + self.assertResourceCalled('File', '/usr/hdp/current/ranger-admin/conf/ranger-admin-env-piddir.sh', content = 'export RANGER_PID_DIR_PATH=/var/run/ranger\nexport RANGER_USER=ranger', owner = 'ranger',