fix(provision): add missing postgres dependency for arvados-api-server
authorJavier Bértoli <jbertoli@curii.com>
Tue, 9 Feb 2021 10:49:50 +0000 (07:49 -0300)
committerJavier Bértoli <jbertoli@curii.com>
Tue, 16 Feb 2021 13:51:28 +0000 (10:51 -0300)
refs #17246 & #17352
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>

tools/salt-install/provision.sh

index 486f43057416d19a8f81121174a911f05efb8cc1..f5b986d1f4702039ed81fe0d34f97f11d7d2524d 100755 (executable)
@@ -307,11 +307,17 @@ else
       "database")
         echo "    - postgres" >> ${S_DIR}/top.sls
       ;;
-      "api","workbench","workbench2","keepweb","keepproxy")
+      "api")
+        # FIXME: https://dev.arvados.org/issues/17352
+        grep -q "postgres.client" ${S_DIR}/top.sls || echo "    - postgres.client" >> ${S_DIR}/top.sls
         grep -q "nginx.passenger" ${S_DIR}/top.sls || echo "    - nginx.passenger" >> ${S_DIR}/top.sls
         echo "    - arvados.${R}" >> ${S_DIR}/top.sls
       ;;
-      "shell","dispatcher")
+      "workbench" | "workbench2" | "keepweb" | "keepproxy")
+        grep -q "nginx.passenger" ${S_DIR}/top.sls || echo "    - nginx.passenger" >> ${S_DIR}/top.sls
+        echo "    - arvados.${R}" >> ${S_DIR}/top.sls
+      ;;
+      "shell" | "dispatcher")
         grep -q "docker" ${S_DIR}/top.sls || echo "    - docker" >> ${S_DIR}/top.sls
         echo "    - arvados.${R}" >> ${S_DIR}/top.sls
       ;;