From: Javier Bértoli <jbertoli@curii.com>
Date: Fri, 23 Jul 2021 18:02:45 +0000 (-0300)
Subject: 17535: Modify provision script to run on Centos
X-Git-Tag: 2.2.2~6
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/ae1f781252e07371f7d650219f6f247e40467182?ds=inline

17535: Modify provision script to run on Centos

Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>
---

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 76d8273af6..02b2ae7c60 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -232,22 +232,23 @@ if [ "${DUMP_CONFIG}" = "yes" ]; then
 else
   # Install a few dependency packages
   # First, let's figure out the OS we're working on
-  OS_ID=$(grep ^ID= /etc/os-release |cut -f 2 -d=  |cut -f 2 -d \")
+  OS_ID=$(grep ^ID= /etc/os-release |cut -f 2 -d \")
   echo "Detected distro: ${OS_ID}"
 
   case ${OS_ID} in
-    "centos")
-      echo "WARNING! Disabling SELinux, see https://dev.arvados.org/issues/18019"
-      sed -i 's/SELINUX=enforcing/SELINUX=permissive' /etc/sysconfig/selinux
-      setenforce permissive
-      yum install -y  curl git jq
+    centos)
+      PREINSTALL_CMD="/bin/true"
+      INSTALL_CMD="yum install -y"
       ;;
-    "debian"|"ubuntu")
-      DEBIAN_FRONTEND=noninteractive apt update
-      DEBIAN_FRONTEND=noninteractive apt install -y curl git jq
+    debian|ubuntu)
+      PREINSTALL_CMD="DEBIAN_FRONTEND=noninteractive apt update"
+      INSTALL_CMD="DEBIAN_FRONTEND=noninteractive apt install -y"
       ;;
   esac
 
+  ${PREINSTALL_CMD}
+  ${INSTALL_CMD} curl git jq
+
   if which salt-call; then
     echo "Salt already installed"
   else