From babf644056299a9289e824a399978ed16784dc48 Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Fri, 4 May 2018 00:35:56 +0200
Subject: [PATCH] Fix the installation of the Swift Hadoop connector (CDH)

The jar file with the same name already exists because
it is installed with the rest of the Cloudera packages,
but it must be overwritten by our version with Swift support.
So do not exit if the jar already exists.

Story: 2001909
Task: 14422
Change-Id: Ibc0a5f7348365f2a6c5658846ee74aa92e78314b
(cherry picked from commit 8cc87685cc63a38050da620884f3077ef364bac0)
---
 .../v5_11_0/resources/images/common/add_jar   | 21 ++++++++-----------
 .../v5_7_0/resources/images/common/add_jar    | 21 ++++++++-----------
 .../v5_9_0/resources/images/common/add_jar    | 21 ++++++++-----------
 3 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/sahara/plugins/cdh/v5_11_0/resources/images/common/add_jar b/sahara/plugins/cdh/v5_11_0/resources/images/common/add_jar
index 7b73206dbe..6842d7856c 100644
--- a/sahara/plugins/cdh/v5_11_0/resources/images/common/add_jar
+++ b/sahara/plugins/cdh/v5_11_0/resources/images/common/add_jar
@@ -8,18 +8,15 @@ HADOOP_SWIFT_BUILD_LOCATION="https://tarballs.openstack.org/sahara-extra/dist/ha
 SWIFT_LIB_URI="$HADOOP_SWIFT_BUILD_LOCATION/hadoop-openstack-${hadoop}.jar"
 HADOOP_SWIFT_JAR_NAME="hadoop-openstack.jar"
 
-if [ ! -f $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME ]; then
-    if [ $test_only -eq 0 ]; then
-        wget -O $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI
+if [ $test_only -eq 0 ]; then
+    wget -O $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI
 
-        if [ $? -ne 0 ]; then
-            echo -e "Could not download Swift Hadoop FS implementation.\nAborting"
-            exit 1
-        fi
-
-        chmod 0644 $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME
-    else
-        exit 0
+    if [ $? -ne 0 ]; then
+        echo -e "Could not download Swift Hadoop FS implementation.\nAborting"
+        exit 1
     fi
-fi
 
+    chmod 0644 $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME
+else
+    exit 0
+fi
diff --git a/sahara/plugins/cdh/v5_7_0/resources/images/common/add_jar b/sahara/plugins/cdh/v5_7_0/resources/images/common/add_jar
index 7b73206dbe..6842d7856c 100644
--- a/sahara/plugins/cdh/v5_7_0/resources/images/common/add_jar
+++ b/sahara/plugins/cdh/v5_7_0/resources/images/common/add_jar
@@ -8,18 +8,15 @@ HADOOP_SWIFT_BUILD_LOCATION="https://tarballs.openstack.org/sahara-extra/dist/ha
 SWIFT_LIB_URI="$HADOOP_SWIFT_BUILD_LOCATION/hadoop-openstack-${hadoop}.jar"
 HADOOP_SWIFT_JAR_NAME="hadoop-openstack.jar"
 
-if [ ! -f $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME ]; then
-    if [ $test_only -eq 0 ]; then
-        wget -O $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI
+if [ $test_only -eq 0 ]; then
+    wget -O $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI
 
-        if [ $? -ne 0 ]; then
-            echo -e "Could not download Swift Hadoop FS implementation.\nAborting"
-            exit 1
-        fi
-
-        chmod 0644 $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME
-    else
-        exit 0
+    if [ $? -ne 0 ]; then
+        echo -e "Could not download Swift Hadoop FS implementation.\nAborting"
+        exit 1
     fi
-fi
 
+    chmod 0644 $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME
+else
+    exit 0
+fi
diff --git a/sahara/plugins/cdh/v5_9_0/resources/images/common/add_jar b/sahara/plugins/cdh/v5_9_0/resources/images/common/add_jar
index 7b73206dbe..6842d7856c 100644
--- a/sahara/plugins/cdh/v5_9_0/resources/images/common/add_jar
+++ b/sahara/plugins/cdh/v5_9_0/resources/images/common/add_jar
@@ -8,18 +8,15 @@ HADOOP_SWIFT_BUILD_LOCATION="https://tarballs.openstack.org/sahara-extra/dist/ha
 SWIFT_LIB_URI="$HADOOP_SWIFT_BUILD_LOCATION/hadoop-openstack-${hadoop}.jar"
 HADOOP_SWIFT_JAR_NAME="hadoop-openstack.jar"
 
-if [ ! -f $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME ]; then
-    if [ $test_only -eq 0 ]; then
-        wget -O $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI
+if [ $test_only -eq 0 ]; then
+    wget -O $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI
 
-        if [ $? -ne 0 ]; then
-            echo -e "Could not download Swift Hadoop FS implementation.\nAborting"
-            exit 1
-        fi
-
-        chmod 0644 $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME
-    else
-        exit 0
+    if [ $? -ne 0 ]; then
+        echo -e "Could not download Swift Hadoop FS implementation.\nAborting"
+        exit 1
     fi
-fi
 
+    chmod 0644 $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME
+else
+    exit 0
+fi