From: Ward Vandewege <ward@curii.com>
Date: Tue, 12 Apr 2022 18:20:18 +0000 (-0400)
Subject: Installer bugfix.
X-Git-Tag: 2.5.0~218
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/43c0c9be21e63ed268d199991a9ad29ec802dbed

Installer bugfix.

refs #16375

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
---

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 44f3d4dffc..080029876b 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -548,16 +548,15 @@ if [ -z "${ROLES}" ]; then
       grep -q "aws_credentials" ${S_DIR}/top.sls || echo "    - extra.aws_credentials" >> ${S_DIR}/top.sls
     fi
     grep -q "letsencrypt"     ${S_DIR}/top.sls || echo "    - letsencrypt" >> ${S_DIR}/top.sls
-  else
-    # Use custom certs, as both bring-your-own and self-signed are copied using this state
+  elif [ "${SSL_MODE}" = "bring-your-own" ]; then
     # Copy certs to formula extra/files
-    # In dev mode, the files will be created and put in the destination directory by the
-    # snakeoil_certs.sls state file
     mkdir -p /srv/salt/certs
     cp -rv ${CUSTOM_CERTS_DIR}/* /srv/salt/certs/
     # We add the custom_certs state
     grep -q "custom_certs"    ${S_DIR}/top.sls || echo "    - extra.custom_certs" >> ${S_DIR}/top.sls
   fi
+  # In self-signed mode, the certificate files will be created and put in the
+  # destination directory by the snakeoil_certs.sls state file
 
   echo "    - postgres" >> ${S_DIR}/top.sls
   echo "    - docker.software" >> ${S_DIR}/top.sls