From 843d068ba5d36e3026e3ad708fc743a90328c859 Mon Sep 17 00:00:00 2001 From: Ali Bajwa Date: Mon, 12 Dec 2016 16:33:14 -0800 Subject: [PATCH] updated for HDF 2.1/Nifi 1.1 --- README.md | 3 ++- metainfo.xml | 2 +- package/scripts/master.py | 3 ++- package/scripts/params.py | 7 +++++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 73555cc..a66d058 100755 --- a/README.md +++ b/README.md @@ -10,7 +10,8 @@ Features: - Includes metrics widgets from [here](https://cwiki.apache.org/confluence/display/NIFI/Ambari+Metrics) Updates: -- Sept-14-2016: updated to support installing HDF 2.0.0.0 (Nifi 1.0) on Ambari 2.4/HDP 2.5 tech preview build/VM +- Dec-12-2016: updated to support installing HDF 2.1.0.0 (Nifi 1.1) on Ambari 2.4/HDP 2.5 +- Sept-14-2016: updated to support installing HDF 2.0.0.0 (Nifi 1.0) on Ambari 2.4/HDP 2.5 - Jul-10-2016: updated to support installing HDF 1.2.0.0 on Ambari 2.4/HDP 2.5 tech preview build/VM Installing on older Ambari versions: diff --git a/metainfo.xml b/metainfo.xml index 1516eac..c70e489 100644 --- a/metainfo.xml +++ b/metainfo.xml @@ -6,7 +6,7 @@ NIFI NiFi Apache NiFi is an easy to use, powerful, and reliable system to process and distribute data. <b> This service is for demo purposes only and not officially supported </b> - 1.0.0-DEMO + 1.1.0-DEMO NIFI_MASTER diff --git a/package/scripts/master.py b/package/scripts/master.py index 23172cd..6709846 100644 --- a/package/scripts/master.py +++ b/package/scripts/master.py @@ -48,7 +48,8 @@ def install(self, env): #Execute('unzip '+params.temp_file+' -d ' + params.nifi_install_dir + ' >> ' + params.nifi_log_file, user=params.nifi_user) Execute('tar -xf '+params.temp_file+' -C '+ params.nifi_dir +' >> ' + params.nifi_log_file, user=params.nifi_user) - Execute('mv '+params.nifi_dir+'/*/*/* ' + params.nifi_dir, user=params.nifi_user) + #Execute('mv '+params.nifi_dir+'/*/*/* ' + params.nifi_dir, user=params.nifi_user) + Execute('mv '+params.nifi_dir+'/*/* ' + params.nifi_dir, user=params.nifi_user) Execute('find '+params.nifi_dir+' -type d -empty -delete', user=params.nifi_user) self.configure(env, True) diff --git a/package/scripts/params.py b/package/scripts/params.py index 21664e0..bd9c95c 100644 --- a/package/scripts/params.py +++ b/package/scripts/params.py @@ -31,8 +31,11 @@ # snapshot_package='http://public-repo-1.hortonworks.com/HDF/centos6/1.x/updates/1.2.0.1/HDF-1.2.0.1-1.zip' # HDF 2.0 -snapshot_package='http://public-repo-1.hortonworks.com/HDF/2.0.0.0/HDF-2.0.0.0-579.tar.gz' - +# snapshot_package='http://public-repo-1.hortonworks.com/HDF/2.0.0.0/HDF-2.0.0.0-579.tar.gz' + +# HDF 2.1 +snapshot_package='http://public-repo-1.hortonworks.com/HDF/centos6/2.x/updates/2.1.0.0/tars/nifi/nifi-1.1.0.2.1.0.0-165-bin.tar.gz' + # params from nifi-ambari-config nifi_install_dir = config['configurations']['nifi-ambari-config']['nifi.install_dir'] nifi_port = config['configurations']['nifi-ambari-config']['nifi.port']