projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c1e7f14
)
18632: fix docker pillar in provision script
author
Javier Bértoli <jbertoli@curii.com>
Thu, 27 Jan 2022 18:31:04 +0000
(15:31 -0300)
committer
Javier Bértoli <jbertoli@curii.com>
Thu, 27 Jan 2022 18:31:04 +0000
(15:31 -0300)
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>
tools/salt-install/provision.sh
patch
|
blob
|
history
diff --git
a/tools/salt-install/provision.sh
b/tools/salt-install/provision.sh
index 83a538ee59bb8337e8ac33e4ad8823733b591f3e..2ba92c3d4aa183df8189a26fce87f3e174542e94 100755
(executable)
--- a/
tools/salt-install/provision.sh
+++ b/
tools/salt-install/provision.sh
@@
-691,7
+691,7
@@
else
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
+ grep -q "
docker" ${P_DIR}/top.sls
|| echo " - docker" >> ${P_DIR}/top.sls
;;
"dispatcher")
# States