Merge branch '21666-provision-test-improvement'

[arvados.git] / tools / salt-install / config_examples / multi_host / aws / states / ssl_key_encrypted.sls

diff --git a/tools/salt-install/config_examples/multi_host/aws/states/ssl_key_encrypted.sls b/tools/salt-install/config_examples/multi_host/aws/states/ssl_key_encrypted.sls
index a387a6dc293366f7cc0bad9d3c4c11ae03148139..4f165dd66298c4cbe95f082e8e84322d8ada52be 100644 (file)
--- a/tools/salt-install/config_examples/multi_host/aws/states/ssl_key_encrypted.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/states/ssl_key_encrypted.sls
@@ -9,6 +9,7 @@
 extra_ssl_key_encrypted_required_pkgs:
   pkg.installed:
     - name: jq
+    - name: awscli
 
 extra_ssl_key_encrypted_password_retrieval_script:
   file.managed:
@@ -49,9 +50,11 @@ extra_ssl_key_encrypted_password_retrieval_service_unit:
         Description=Arvados SSL private key password retrieval service
         After=network.target
         [Service]
+        # WARNING: the script below assumes that RuntimeDirectory only holds one
+        # path value, won't work with multiple paths.
         RuntimeDirectory=arvados
-        ExecStartPre={{ ('/usr/bin/mkfifo --mode=0600 %t/arvados/' ~ ssl_key_encrypted.privkey_password_filename) | yaml_dquote }}
-        ExecStart={{ ('/bin/bash ' ~ ssl_key_encrypted.privkey_password_script) | yaml_dquote }}
+        ExecStartPre=/usr/bin/mkfifo --mode=0600 {{ ('%t/arvados/' ~ ssl_key_encrypted.privkey_password_filename) | yaml_dquote }}
+        ExecStart=/bin/bash {{ ssl_key_encrypted.privkey_password_script | yaml_dquote }}
         [Install]
         WantedBy=multi-user.target