updating to support Ambari 2.4

abajwa-hw · Jul 10, 2016 · 5eed427 · 5eed427
1 parent 85bd3b3
commit 5eed427
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/package/scripts/master.py b/package/scripts/master.py
@@ -49,23 +49,29 @@ def install(self, env):
 
 
 
-    #create the log dir if it not already present
-    Directory([status_params.nifi_pid_dir, params.nifi_log_dir],
-            owner=params.nifi_user,
-            group=params.nifi_group,
-            recursive=True
-    )   
+    #create the log dir if it not already present - the below won't work on both Ambari 2.4 so re-writing
+
+    #Directory([status_params.nifi_pid_dir, params.nifi_log_dir],
+    #        owner=params.nifi_user,
+    #        group=params.nifi_group,
+    #        recursive=True
+    #)
+
+    Execute('mkdir -p '+status_params.nifi_pid_dir+' '+params.nifi_log_dir)
+    Execute('chown -R ' + params.nifi_user + ':' + params.nifi_group + ' ' + status_params.nifi_pid_dir)
+    Execute('chown -R ' + params.nifi_user + ':' + params.nifi_group + ' ' + params.nifi_log_dir)    
 
     Execute('touch ' +  params.nifi_log_file, user=params.nifi_user)    
     Execute('rm -rf ' + params.nifi_dir, ignore_failures=True)
-    #Execute('mkdir -p '+params.nifi_dir)
-    #Execute('chown -R ' + params.nifi_user + ':' + params.nifi_group + ' ' + params.nifi_dir)
-
-    Directory([params.nifi_dir],
-            owner=params.nifi_user,
-            group=params.nifi_group,
-            recursive=True
-    )  
+
+    #Directory([params.nifi_dir],
+    #        owner=params.nifi_user,
+    #        group=params.nifi_group,
+    #        recursive=True
+    #)  
+
+    Execute('mkdir -p '+params.nifi_dir)
+    Execute('chown -R ' + params.nifi_user + ':' + params.nifi_group + ' ' + params.nifi_dir)
 
     #User selected option to use prebuilt nifi package 
     if params.setup_prebuilt:

diff --git a/package/scripts/params.py b/package/scripts/params.py
@@ -2,7 +2,6 @@
 from resource_management import *
 from resource_management.libraries.script.script import Script
 import sys, os, glob
-from resource_management.libraries.functions.version import format_hdp_stack_version
 from resource_management.libraries.functions.default import default