From e04a4d073890b5bc2ca5817c154acf3a344a7849 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Tue, 25 Jan 2022 14:55:38 -0500 Subject: [PATCH] 18678: installer: when custom certs are used, do not abort when a role is used that does not require any certificates. Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- .../multi_host/aws/states/custom_certs.sls | 14 ++++++++------ .../multiple_hostnames/states/custom_certs.sls | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/tools/salt-install/config_examples/multi_host/aws/states/custom_certs.sls b/tools/salt-install/config_examples/multi_host/aws/states/custom_certs.sls index 3716503391..3b2be59f36 100644 --- a/tools/salt-install/config_examples/multi_host/aws/states/custom_certs.sls +++ b/tools/salt-install/config_examples/multi_host/aws/states/custom_certs.sls @@ -6,17 +6,18 @@ {%- set dest_cert_dir = '/etc/nginx/ssl' %} {%- set certs = salt['pillar.get']('extra_custom_certs', []) %} +{% if certs %} extra_custom_certs_file_directory_certs_dir: file.directory: - name: /etc/nginx/ssl - require: - pkg: nginx_install -{%- for cert in certs %} - {%- set cert_file = 'arvados-' ~ cert ~ '.pem' %} - {#- set csr_file = 'arvados-' ~ cert ~ '.csr' #} - {%- set key_file = 'arvados-' ~ cert ~ '.key' %} - {% for c in [cert_file, key_file] %} + {%- for cert in certs %} + {%- set cert_file = 'arvados-' ~ cert ~ '.pem' %} + {#- set csr_file = 'arvados-' ~ cert ~ '.csr' #} + {%- set key_file = 'arvados-' ~ cert ~ '.key' %} + {% for c in [cert_file, key_file] %} extra_custom_certs_file_copy_{{ c }}: file.copy: - name: {{ dest_cert_dir }}/{{ c }} @@ -27,5 +28,6 @@ extra_custom_certs_file_copy_{{ c }}: - unless: cmp {{ dest_cert_dir }}/{{ c }} {{ orig_cert_dir }}/{{ c }} - require: - file: extra_custom_certs_file_directory_certs_dir + {%- endfor %} {%- endfor %} -{%- endfor %} +{%- endif %} diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/states/custom_certs.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/custom_certs.sls index 3716503391..3b2be59f36 100644 --- a/tools/salt-install/config_examples/single_host/multiple_hostnames/states/custom_certs.sls +++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/custom_certs.sls @@ -6,17 +6,18 @@ {%- set dest_cert_dir = '/etc/nginx/ssl' %} {%- set certs = salt['pillar.get']('extra_custom_certs', []) %} +{% if certs %} extra_custom_certs_file_directory_certs_dir: file.directory: - name: /etc/nginx/ssl - require: - pkg: nginx_install -{%- for cert in certs %} - {%- set cert_file = 'arvados-' ~ cert ~ '.pem' %} - {#- set csr_file = 'arvados-' ~ cert ~ '.csr' #} - {%- set key_file = 'arvados-' ~ cert ~ '.key' %} - {% for c in [cert_file, key_file] %} + {%- for cert in certs %} + {%- set cert_file = 'arvados-' ~ cert ~ '.pem' %} + {#- set csr_file = 'arvados-' ~ cert ~ '.csr' #} + {%- set key_file = 'arvados-' ~ cert ~ '.key' %} + {% for c in [cert_file, key_file] %} extra_custom_certs_file_copy_{{ c }}: file.copy: - name: {{ dest_cert_dir }}/{{ c }} @@ -27,5 +28,6 @@ extra_custom_certs_file_copy_{{ c }}: - unless: cmp {{ dest_cert_dir }}/{{ c }} {{ orig_cert_dir }}/{{ c }} - require: - file: extra_custom_certs_file_directory_certs_dir + {%- endfor %} {%- endfor %} -{%- endfor %} +{%- endif %} -- 2.30.2