20969: Fixes single host case.

[arvados.git] / tools / salt-install / config_examples / single_host / single_hostname / states / snakeoil_certs.sls

diff --git a/tools/salt-install/config_examples/single_host/single_hostname/states/snakeoil_certs.sls b/tools/salt-install/config_examples/single_host/single_hostname/states/snakeoil_certs.sls
index 4cbdee32fc0527b3a03c0229d86f86d2d755cb90..2cee5c9b49bd73750ebf07646d4113ff0a67a37a 100644 (file)
--- a/tools/salt-install/config_examples/single_host/single_hostname/states/snakeoil_certs.sls
+++ b/tools/salt-install/config_examples/single_host/single_hostname/states/snakeoil_certs.sls
@@ -62,21 +62,21 @@ extra_snakeoil_certs_arvados_snakeoil_ca_cmd_run:
     - name: |
         # These dirs are not too CentOS-ish, but this is a helper script
         # and they should be enough
-        mkdir -p /etc/ssl/certs/ /etc/ssl/private/ && \
+        /bin/bash -c "mkdir -p /etc/ssl/certs/ /etc/ssl/private/ && \
         openssl req \
           -new \
           -nodes \
           -sha256 \
           -x509 \
-          -subj "/C=CC/ST=Some State/O=Arvados Formula/OU=arvados-formula/CN=snakeoil-ca-{{ arvados.cluster.name }}.{{ arvados.cluster.domain }}" \
+          -subj \"/C=CC/ST=Some State/O=Arvados Formula/OU=arvados-formula/CN=snakeoil-ca-{{ arvados.cluster.name }}.{{ arvados.cluster.domain }}\" \
           -extensions x509_ext \
           -config <(cat {{ openssl_conf }} \
-                  <(printf "\n[x509_ext]\nbasicConstraints=critical,CA:true,pathlen:0\nkeyUsage=critical,keyCertSign,cRLSign")) \
+                  <(printf \"\n[x509_ext]\nbasicConstraints=critical,CA:true,pathlen:0\nkeyUsage=critical,keyCertSign,cRLSign\")) \
           -out {{ arvados_ca_cert_file }} \
           -keyout {{ arvados_ca_key_file }} \
           -days 365 && \
         cp {{ arvados_ca_cert_file }} {{ arvados_ca_cert_dest }} && \
-        {{ update_ca_cert }}
+        {{ update_ca_cert }}"
     - unless:
       - test -f {{ arvados_ca_cert_file }}
       - openssl verify -CAfile {{ arvados_ca_cert_file }} {{ arvados_ca_cert_file }}
@@ -143,8 +143,8 @@ extra_snakeoil_certs_arvados_snakeoil_cert___HOSTNAME_EXT___cmd_run:
       - pkg: extra_snakeoil_certs_dependencies_pkg_installed
       - cmd: extra_snakeoil_certs_arvados_snakeoil_ca_cmd_run
     - require_in:
-      - file: extra_custom_certs_file_copy_arvados-__HOSTNAME_EXT__.pem
-      - file: extra_custom_certs_file_copy_arvados-__HOSTNAME_EXT__.key
+      - file: extra_custom_certs___HOSTNAME_EXT___cert_file_copy
+      - file: extra_custom_certs___HOSTNAME_EXT___key_file_copy
 
   {%- if grains.get('os_family') == 'Debian' %}
 extra_snakeoil_certs_certs_permissions___HOSTNAME_EXT___cmd_run: