Browse code

Merge "Handle proxy environment variables for epel-release install"

Jenkins authored on 2015/03/03 23:11:25
Showing 1 changed files
... ...
@@ -250,8 +250,10 @@ failovermethod=priority
250 250
 enabled=0
251 251
 gpgcheck=0
252 252
 EOF
253
-    # bare yum call due to --enablerepo
254
-    sudo yum --enablerepo=epel-bootstrap -y install epel-release || \
253
+    # Enable a bootstrap repo.  It is removed after finishing
254
+    # the epel-release installation.
255
+    sudo yum-config-manager --enable epel-bootstrap
256
+    yum_install epel-release || \
255 257
         die $LINENO "Error installing EPEL repo, cannot continue"
256 258
     # epel rpm has installed it's version
257 259
     sudo rm -f /etc/yum.repos.d/epel-bootstrap.repo