Browse Source

AMBARI-15197. Make use of log dir properties while installing Ranger(gautam)

Gautam Borad 9 years ago
parent
commit
ac35c6dd83

+ 10 - 0
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>

+ 0 - 5
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,

+ 22 - 2
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}/"),

+ 5 - 0
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>

+ 11 - 1
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'),

+ 5 - 1
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>