Explorar el Código

AMBARI-516. Fix epel install to be using curl calls. (Contributed by Mahadev)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1347367 13f79535-47bb-0310-9956-ffa450edef68
Vikram Dixit K hace 13 años
padre
commit
8c61650b79
Se han modificado 2 ficheros con 5 adiciones y 1 borrados
  1. 2 0
      CHANGES.txt
  2. 3 1
      hmc/ShellScripts/puppet_agent_install.sh

+ 2 - 0
CHANGES.txt

@@ -6,6 +6,8 @@ characters wide.
 
 
 Release 0.1.x - unreleased
 Release 0.1.x - unreleased
 
 
+  AMBARI-516. Fix epel install to be using curl calls. (Mahadev via Vikram)
+
   AMBARI-513. Fix for previous patch (Ramya via Vikram)
   AMBARI-513. Fix for previous patch (Ramya via Vikram)
 
 
   AMBARI-515. Modules tar size increases. (Jitendra via Vikram)
   AMBARI-515. Modules tar size increases. (Jitendra via Vikram)

+ 3 - 1
hmc/ShellScripts/puppet_agent_install.sh

@@ -158,7 +158,9 @@ if [[ "${usingLocalRepo}" == "0" ]]; then
     cmd="cat $repoFile | grep \"baseurl\" | awk -F= '{print \$2}'| awk 'NR==1' | sed 's/ //g'"
     cmd="cat $repoFile | grep \"baseurl\" | awk -F= '{print \$2}'| awk 'NR==1' | sed 's/ //g'"
     epelUrl=`eval $cmd`
     epelUrl=`eval $cmd`
     epelRPM=$epelUrl/epel-release-5-4.noarch.rpm
     epelRPM=$epelUrl/epel-release-5-4.noarch.rpm
-    rpm -Uvh $epelRPM
+    mkdir -p /tmp/HDP-artifacts/
+    curl -f --retry 10 $epelRPM -o /tmp/HDP-artifacts/epel-release-5-4.noarch.rpm
+    rpm -Uvh /tmp/HDP-artifacts/epel-release-5-4.noarch.rpm
     #make sure epel is installed else fail
     #make sure epel is installed else fail
     epel_installed=`yum repolist enabled | grep epel`
     epel_installed=`yum repolist enabled | grep epel`
     if [[ "x$epel_installed" == "x" ]]; then
     if [[ "x$epel_installed" == "x" ]]; then