From 2c622f46cb0324f392a1f8006ac30521a856646b Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Mon, 29 Jan 2024 10:31:27 -0500 Subject: [PATCH] 21361: Remove Ubuntu 18.04 exception from Salt installer Arvados-DCO-1.1-Signed-off-by: Brett Smith --- .../multiple_hostnames/states/snakeoil_certs.sls | 13 ------------- .../single_hostname/states/snakeoil_certs.sls | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/states/snakeoil_certs.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/snakeoil_certs.sls index 06af05b2df..a8b487e29a 100644 --- a/tools/salt-install/config_examples/single_host/multiple_hostnames/states/snakeoil_certs.sls +++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/snakeoil_certs.sls @@ -46,19 +46,6 @@ extra_snakeoil_certs_dependencies_pkg_installed: - openssl - ca-certificates -# Remove the RANDFILE parameter in openssl.cnf as it makes openssl fail in Ubuntu 18.04 -# Saving and restoring the rng state is not necessary anymore in the openssl 1.1.1 -# random generator, cf -# https://github.com/openssl/openssl/issues/7754 -# -extra_snakeoil_certs_file_comment_etc_openssl_conf: - file.comment: - - name: /etc/ssl/openssl.cnf - - regex: ^RANDFILE.* - - onlyif: grep -q ^RANDFILE /etc/ssl/openssl.cnf - - require_in: - - cmd: extra_snakeoil_certs_arvados_snakeoil_ca_cmd_run - extra_snakeoil_certs_arvados_snakeoil_ca_cmd_run: # Taken from https://github.com/arvados/arvados/blob/master/tools/arvbox/lib/arvbox/docker/service/certificate/run cmd.run: 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 2cee5c9b49..df8dcc7f30 100644 --- 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 @@ -43,19 +43,6 @@ extra_snakeoil_certs_dependencies_pkg_installed: - openssl - ca-certificates -# Remove the RANDFILE parameter in openssl.cnf as it makes openssl fail in Ubuntu 18.04 -# Saving and restoring the rng state is not necessary anymore in the openssl 1.1.1 -# random generator, cf -# https://github.com/openssl/openssl/issues/7754 -# -extra_snakeoil_certs_file_comment_etc_openssl_conf: - file.comment: - - name: /etc/ssl/openssl.cnf - - regex: ^RANDFILE.* - - onlyif: grep -q ^RANDFILE /etc/ssl/openssl.cnf - - require_in: - - cmd: extra_snakeoil_certs_arvados_snakeoil_ca_cmd_run - extra_snakeoil_certs_arvados_snakeoil_ca_cmd_run: # Taken from https://github.com/arvados/arvados/blob/master/tools/arvbox/lib/arvbox/docker/service/certificate/run cmd.run: -- 2.30.2