From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 23 Jun 2017 17:05:14 +0000 (+0000)
Subject: Merge "Fix rpms being installed via DeployArtifactURLs"
X-Git-Tag: opnfv-6.0.0~491
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ffcc946a6bd2a74d003f20fa0f5330073c2ce4ac;p=apex-tripleo-heat-templates.git

Merge "Fix rpms being installed via DeployArtifactURLs"
---

ffcc946a6bd2a74d003f20fa0f5330073c2ce4ac
diff --cc puppet/deploy-artifacts.sh
index 6e7f0ec1,9f231869..e4d20b49
--- a/puppet/deploy-artifacts.sh
+++ b/puppet/deploy-artifacts.sh
@@@ -16,10 -18,12 +18,12 @@@ if [ -n "$artifact_urls" ]; the
        tar xvzf $TMP_DATA/file_data
        popd
      else
 -      echo "ERROR: Unsupported file format."
 +      echo "ERROR: Unsupported file format: $URL"
        exit 1
      fi
-     rm $TMP_DATA/file_data
+     if [ -f $TMP_DATA/file_data ]; then
+       rm $TMP_DATA/file_data
+     fi
    done
  else
    echo "No artifact_urls was set. Skipping..."