[ARVADOS] created: 2.1.0-1424-gf5425f0bf

[Git user]

        at  f5425f0bf346783e06c9b53ac2be6a78119b5e49 (commit)


commit f5425f0bf346783e06c9b53ac2be6a78119b5e49
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Sun Oct 3 20:43:14 2021 -0300

    18248: edit provision's snakeoil cert for ubuntu-18.04
    
    Comment RANDFILE line in /etc/ssl/openssl.cnf to fix ubuntu 18.04 testing
    
    See https://github.com/openssl/openssl/issues/7754#issuecomment-541310006
    
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>

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 91617e4fa..cebfa9058 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
@@ -36,6 +36,17 @@ arvados_test_salt_states_examples_single_host_snakeoil_certs_dependencies_pkg_in
       - openssl
       - ca-certificates
 
+# Edit the openssl.conf file to fix the RND error
+#     20:03:39                   Can't load /home/jenkins/.rnd into RNG
+# as seen 
+#     https://ci.arvados.org/view/Release%20Pipeline/job/test-provision-ubuntu1804/91/console
+# using the solution provided here
+#     https://github.com/openssl/openssl/issues/7754#issuecomment-541310006
+arvados_test_salt_states_examples_single_host_snakeoil_certs_file_comment_etc_openssl_conf:
+  file.comment:
+    - name: /etc/ssl/openssl.cnf
+    - regex: ^RANDFILE.*
+
 arvados_test_salt_states_examples_single_host_snakeoil_certs_arvados_snake_oil_ca_cmd_run:
   # Taken from https://github.com/arvados/arvados/blob/master/tools/arvbox/lib/arvbox/docker/service/certificate/run
   cmd.run:
@@ -62,6 +73,7 @@ arvados_test_salt_states_examples_single_host_snakeoil_certs_arvados_snake_oil_c
       - openssl verify -CAfile {{ arvados_ca_cert_file }} {{ arvados_ca_cert_file }}
     - require:
       - pkg: arvados_test_salt_states_examples_single_host_snakeoil_certs_dependencies_pkg_installed
+      - file: arvados_test_salt_states_examples_single_host_snakeoil_certs_file_comment_etc_openssl_conf
 
 arvados_test_salt_states_examples_single_host_snakeoil_certs_arvados_snake_oil_cert_cmd_run:
   cmd.run:

-----------------------------------------------------------------------


hooks/post-receive
--