From 7c0fcad91b7ed31ebec9c9ca07269aaa4fa9d1df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Mon, 17 May 2021 19:48:30 -0300 Subject: [PATCH] fix(provision): don't install docker-compose MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit no issue # Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- tools/salt-install/provision.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh index 02da9933bd..a9a4704d85 100755 --- a/tools/salt-install/provision.sh +++ b/tools/salt-install/provision.sh @@ -376,7 +376,7 @@ if [ -z "${ROLES}" ]; then grep -q "letsencrypt" ${S_DIR}/top.sls || echo " - letsencrypt" >> ${S_DIR}/top.sls fi echo " - postgres" >> ${S_DIR}/top.sls - echo " - docker" >> ${S_DIR}/top.sls + echo " - docker.software" >> ${S_DIR}/top.sls echo " - arvados" >> ${S_DIR}/top.sls # Pillars @@ -439,7 +439,7 @@ else ;; "shell") # States - grep -q "docker" ${S_DIR}/top.sls || echo " - docker" >> ${S_DIR}/top.sls + grep -q "docker" ${S_DIR}/top.sls || echo " - docker.software" >> ${S_DIR}/top.sls grep -q "arvados.${R}" ${S_DIR}/top.sls || echo " - arvados.${R}" >> ${S_DIR}/top.sls # Pillars grep -q "" ${P_DIR}/top.sls || echo " - docker" >> ${P_DIR}/top.sls @@ -447,7 +447,7 @@ else ;; "dispatcher") # States - grep -q "docker" ${S_DIR}/top.sls || echo " - docker" >> ${S_DIR}/top.sls + grep -q "docker" ${S_DIR}/top.sls || echo " - docker.software" >> ${S_DIR}/top.sls grep -q "arvados.${R}" ${S_DIR}/top.sls || echo " - arvados.${R}" >> ${S_DIR}/top.sls # Pillars # ATM, no specific pillar needed -- 2.30.2