You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ga...@apache.org on 2016/03/30 07:05:43 UTC
ambari git commit: AMBARI-15197. Make use of log dir properties while
installing Ranger(gautam)
Repository: ambari
Updated Branches:
refs/heads/trunk 08ffdea38 -> ac35c6dd8
AMBARI-15197. Make use of log dir properties while installing Ranger(gautam)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ac35c6dd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ac35c6dd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ac35c6dd
Branch: refs/heads/trunk
Commit: ac35c6dd83fc61ff0ea35a454a78f9df54b57aec
Parents: 08ffdea
Author: Gautam Borad <ga...@apache.org>
Authored: Tue Feb 23 10:15:09 2016 +0530
Committer: Gautam Borad <ga...@apache.org>
Committed: Wed Mar 30 10:35:33 2016 +0530
----------------------------------------------------------------------
.../RANGER/0.4.0/configuration/ranger-env.xml | 10 ++++++++
.../0.4.0/package/scripts/ranger_service.py | 5 ----
.../0.4.0/package/scripts/setup_ranger_xml.py | 24 ++++++++++++++++++--
.../0.5.0.2.3/configuration/kms-env.xml | 5 ++++
.../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 12 +++++++++-
.../RANGER/configuration/ranger-ugsync-site.xml | 6 ++++-
6 files changed, 53 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ac35c6dd/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
index d73272d..b436b75 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
@@ -48,12 +48,22 @@
<name>ranger_admin_log_dir</name>
<value>/var/log/ranger/admin</value>
<description></description>
+ <value-attributes>
+ <type>directory</type>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>ranger_usersync_log_dir</name>
<value>/var/log/ranger/usersync</value>
<description></description>
+ <value-attributes>
+ <type>directory</type>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ac35c6dd/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_service.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_service.py
index 8bbab02..7e49c98 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_service.py
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_service.py
@@ -34,11 +34,6 @@ def ranger_service(name, action=None):
if params.stack_is_hdp23_or_further:
- Directory(format('{usersync_log_dir}/'),
- owner = params.unix_user,
- group = params.unix_group,
- recursive_ownership = True,
- )
Execute(params.usersync_start,
environment=env_dict,
not_if=no_op_test,
http://git-wip-us.apache.org/repos/asf/ambari/blob/ac35c6dd/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
----------------------------------------------------------------------
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 3542814..74d0fe4 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
@@ -102,7 +102,17 @@ def setup_ranger_admin(upgrade_type=None):
Directory(params.admin_log_dir,
owner = params.unix_user,
- group = params.unix_group
+ group = params.unix_group,
+ create_parents = True,
+ cd_access='a',
+ mode=0755
+ )
+
+ File(format('{ranger_conf}/ranger-admin-env-logdir.sh'),
+ content = format("export RANGER_ADMIN_LOG_DIR={admin_log_dir}"),
+ owner = params.unix_user,
+ group = params.unix_group,
+ mode=0755
)
if os.path.isfile(params.ranger_admin_default_file):
@@ -332,7 +342,17 @@ def setup_usersync(upgrade_type=None):
Directory(params.usersync_log_dir,
owner = params.unix_user,
- group = params.unix_group
+ group = params.unix_group,
+ cd_access = 'a',
+ create_parents=True,
+ mode=0755
+ )
+
+ File(format('{ranger_ugsync_conf}/ranger-usersync-env-logdir.sh'),
+ content = format("export logdir={usersync_log_dir}"),
+ owner = params.unix_user,
+ group = params.unix_group,
+ mode=0755
)
Directory(format("{ranger_ugsync_conf}/"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/ac35c6dd/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml
index 29d9d2a..f62c529 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml
@@ -47,6 +47,11 @@
<name>kms_log_dir</name>
<value>/var/log/ranger/kms</value>
<description></description>
+ <value-attributes>
+ <type>directory</type>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ac35c6dd/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
----------------------------------------------------------------------
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 11a705a..4807dc5 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
@@ -190,7 +190,17 @@ def kms(upgrade_type=None):
Directory(params.kms_log_dir,
owner = params.kms_user,
- group = params.kms_group
+ group = params.kms_group,
+ cd_access = 'a',
+ create_parents=True,
+ mode=0755
+ )
+
+ File(format('{kms_conf_dir}/ranger-kms-env-logdir.sh'),
+ content = format("export RANGER_KMS_LOG_DIR={kms_log_dir}"),
+ owner = params.kms_user,
+ group = params.kms_group,
+ mode=0755
)
Execute(('ln','-sf', format('{kms_home}/ranger-kms'),'/usr/bin/ranger-kms'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/ac35c6dd/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
index cd9a7b9..6cbd12f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
@@ -308,8 +308,12 @@
<property>
<name>ranger.usersync.logdir</name>
- <value>/var/log/ranger/usersync</value>
+ <value>{{usersync_log_dir}}</value>
<description>User sync log directory</description>
+ <value-attributes>
+ <visible>false</visible>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>