[ARVADOS] updated: 2.1.0-1861-g37013ae30

[Git user]

Summary of changes:
 tools/salt-install/provision.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

       via  37013ae307a426e28dd3a7784e3bd95ef6ddc57e (commit)
      from  addf38844896e204083c1e0eb69e5466c4733c02 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 37013ae307a426e28dd3a7784e3bd95ef6ddc57e
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Thu Jan 27 19:06:33 2022 -0300

    18632: fix missing docker's pillar in shell node
    
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 2ba92c3d4..482624c72 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -607,7 +607,6 @@ else
         grep -q "arvados.${R}" ${S_DIR}/top.sls    || echo "    - arvados.${R}" >> ${S_DIR}/top.sls
         # Pillars
         grep -q "aws_credentials" ${P_DIR}/top.sls          || echo "    - aws_credentials" >> ${P_DIR}/top.sls
-        grep -q "docker" ${P_DIR}/top.sls                   || echo "    - docker" >> ${P_DIR}/top.sls
         grep -q "postgresql" ${P_DIR}/top.sls               || echo "    - postgresql" >> ${P_DIR}/top.sls
         grep -q "nginx_passenger" ${P_DIR}/top.sls          || echo "    - nginx_passenger" >> ${P_DIR}/top.sls
         grep -q "nginx_${R}_configuration" ${P_DIR}/top.sls || echo "    - nginx_${R}_configuration" >> ${P_DIR}/top.sls
@@ -698,7 +697,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
-        # ATM, no specific pillar needed
+        grep -q "docker" ${P_DIR}/top.sls       || echo "    - docker" >> ${P_DIR}/top.sls
       ;;
       "keepstore")
         # States

-----------------------------------------------------------------------


hooks/post-receive
--