X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=foreman%2Fci%2Fbootstrap.sh;h=c98f00e6c603c9698ca831f8152c1f45d956c30e;hb=92278b800a2637083c2c5e1f03f1190be289ca1c;hp=1b364785d352184a8f39afaa6bd106b2ea0b62df;hpb=220bcb74645f5beba93282a38bac0276be199a71;p=genesis.git

diff --git a/foreman/ci/bootstrap.sh b/foreman/ci/bootstrap.sh
index 1b36478..c98f00e 100755
--- a/foreman/ci/bootstrap.sh
+++ b/foreman/ci/bootstrap.sh
@@ -20,25 +20,13 @@ green=`tput setaf 2`
 ##END VARS
 
 
-##install EPEL
-if ! yum repolist | grep "epel/"; then
-  if ! rpm -Uvh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm; then
-    printf '%s\n' 'bootstrap.sh: Unable to configure EPEL repo' >&2
-    exit 1
-  fi
-else
-  printf '%s\n' 'bootstrap.sh: Skipping EPEL repo as it is already configured.'
-fi
+# Install EPEL repo for access to many other yum repos
+# Major version is pinned to force some consistency for Arno
+yum install -y epel-release-7*
 
-##install python,gcc,git
-if ! yum -y install python-pip python-virtualenv gcc git; then
-  printf '%s\n' 'bootstrap.sh: Unable to install python,gcc,git packages' >&2
-  exit 1
-fi
-
-##Install sshpass
-if ! yum -y install sshpass; then
-  printf '%s\n' 'bootstrap.sh: Unable to install sshpass' >&2
+# Install other required packages
+if ! yum -y install python-pip python-virtualenv gcc git sshpass ansible python-requests; then
+  printf '%s\n' 'bootstrap.sh: failed to install required packages' >&2
   exit 1
 fi
 
@@ -53,17 +41,6 @@ if [ ! -d khaleesi ]; then
   fi
 fi
 
-if ! pip install ansible; then
-  printf '%s\n' 'bootstrap.sh: Unable to install ansible' >&2
-  exit 1
-fi
-
-if ! pip install requests; then
-  printf '%s\n' 'bootstrap.sh: Unable to install requests python package' >&2
-  exit 1
-fi
-
-
 cd khaleesi
 
 cp ansible.cfg.example ansible.cfg