From 1e88ff36efbd84d827771f6d9fdab43754983b01 2025-02-02 21:40:16 From: Branko Majic Date: 2025-02-02 21:40:16 Subject: [PATCH] MAR-243: Drop inventory_hostname use from tests where possible: - Primarily focused on Ansible playbooks and variable files. - The variable is still used within some Python test fixtures. Test behaviour should still be correct, with one advantage being that lookups should be much faster than using the setup module (which would require running Ansible code on each remote/test machine). --- diff --git a/roles/backup_client/molecule/default/group_vars/parameters-optional.yml b/roles/backup_client/molecule/default/group_vars/parameters-optional.yml index 7afe8d0e5a7a5b72fe594f90d583f1c7d1ebbc95..49986b23644f5cc022601f647649b307e0fbe17a 100644 --- a/roles/backup_client/molecule/default/group_vars/parameters-optional.yml +++ b/roles/backup_client/molecule/default/group_vars/parameters-optional.yml @@ -7,7 +7,7 @@ backup_additional_encryption_keys: backup_client_username: backupuser backup_encryption_key: "{{ lookup('file', 'tests/data/gnupg/parameters-optional.asc') }}" backup_server: 192.168.56.10 -backup_server_destination: "/duplicity/{{ inventory_hostname }}" +backup_server_destination: "/duplicity/{{ ansible_fqdn }}" backup_server_host_ssh_public_keys: - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}" diff --git a/roles/ldap_server/molecule/default/group_vars/parameters-mandatory.yml b/roles/ldap_server/molecule/default/group_vars/parameters-mandatory.yml index 607f56184812c7162ee4978ccef930c5783abdab..82d4fcd680388091bec2759043290eac988ac22b 100644 --- a/roles/ldap_server/molecule/default/group_vars/parameters-mandatory.yml +++ b/roles/ldap_server/molecule/default/group_vars/parameters-mandatory.yml @@ -4,8 +4,8 @@ ldap_admin_password: adminpassword ldap_server_domain: "local" -ldap_server_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_ldap.cert.pem') }}" -ldap_server_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_ldap.key.pem') }}" +ldap_server_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_ldap.cert.pem') }}" +ldap_server_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_ldap.key.pem') }}" # ldap_client ldap_client_config: diff --git a/roles/ldap_server/molecule/default/group_vars/parameters-optional.yml b/roles/ldap_server/molecule/default/group_vars/parameters-optional.yml index 18e80b9d103eafb6695b508b41e950f1962b7898..c0a3c4e09c5daf83bc7e8ab28178cfa7e505ef73 100644 --- a/roles/ldap_server/molecule/default/group_vars/parameters-optional.yml +++ b/roles/ldap_server/molecule/default/group_vars/parameters-optional.yml @@ -2,8 +2,8 @@ ldap_admin_password: adminpassword -ldap_server_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_ldap.cert.pem') }}" -ldap_server_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_ldap.key.pem') }}" +ldap_server_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_ldap.cert.pem') }}" +ldap_server_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_ldap.key.pem') }}" ldap_entries: - dn: uid=john,dc=local diff --git a/roles/php_website/molecule/default/prepare.yml b/roles/php_website/molecule/default/prepare.yml index e544931bc0cd9959b4026a7a3bbe5e2748d1a099..61055c00b027cf8641b792a7d3cb189a9e2357c1 100644 --- a/roles/php_website/molecule/default/prepare.yml +++ b/roles/php_website/molecule/default/prepare.yml @@ -89,7 +89,7 @@ line: "{{ item.value }}" state: present with_dict: - myhostname: "myhostname = {{ inventory_hostname }}" + myhostname: "myhostname = {{ ansible_fqdn }}" mailbox_command: 'mailbox_command = procmail -a "$EXTENSION"' notify: - Restart Postfix diff --git a/roles/web_server/molecule/default/group_vars/parameters-mandatory.yml b/roles/web_server/molecule/default/group_vars/parameters-mandatory.yml index c222238fdc453f7e60a8e6343230ac69a39023f4..70f20b483c495a0c59422843837d34e7078dd9e0 100644 --- a/roles/web_server/molecule/default/group_vars/parameters-mandatory.yml +++ b/roles/web_server/molecule/default/group_vars/parameters-mandatory.yml @@ -1,7 +1,7 @@ --- -default_https_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_https.cert.pem') }}" -default_https_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_https.key.pem') }}" +default_https_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_https.cert.pem') }}" +default_https_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_https.key.pem') }}" # common ca_certificates: diff --git a/roles/web_server/molecule/default/group_vars/parameters-optional.yml b/roles/web_server/molecule/default/group_vars/parameters-optional.yml index f94a2b05f2883fb815d17c29d1d4ad667e1a9822..371b30728db4aaac617caa1def8a02a9d7eed9b8 100644 --- a/roles/web_server/molecule/default/group_vars/parameters-optional.yml +++ b/roles/web_server/molecule/default/group_vars/parameters-optional.yml @@ -1,7 +1,7 @@ --- -default_https_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_https.cert.pem') }}" -default_https_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_https.key.pem') }}" +default_https_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_https.cert.pem') }}" +default_https_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_https.key.pem') }}" environment_indicator: background_colour: "#ff0000" text_colour: "#00ff00" diff --git a/roles/wsgi_website/molecule/default/prepare.yml b/roles/wsgi_website/molecule/default/prepare.yml index e7fe3b66d82510bc9db713ad4c5bc9354f494c1b..41097ae6f9f44616718a67a3a6540d0a3015faee 100644 --- a/roles/wsgi_website/molecule/default/prepare.yml +++ b/roles/wsgi_website/molecule/default/prepare.yml @@ -95,7 +95,7 @@ line: "{{ item.value }}" state: present with_dict: - myhostname: "myhostname = {{ inventory_hostname }}" + myhostname: "myhostname = {{ ansible_fqdn }}" mailbox_command: 'mailbox_command = procmail -a "$EXTENSION"' notify: - Restart Postfix diff --git a/roles/xmpp_server/molecule/default/group_vars/parameters-mandatory.yml b/roles/xmpp_server/molecule/default/group_vars/parameters-mandatory.yml index c03d177095582f45695e4f60889ae0372d79e3de..fd7ef012061b92908790c8d6dcf45e03f0370732 100644 --- a/roles/xmpp_server/molecule/default/group_vars/parameters-mandatory.yml +++ b/roles/xmpp_server/molecule/default/group_vars/parameters-mandatory.yml @@ -7,8 +7,8 @@ xmpp_domains: xmpp_ldap_base_dn: dc=local xmpp_ldap_password: prosodypassword xmpp_ldap_server: ldap-server -xmpp_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_xmpp.cert.pem') }}" -xmpp_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_xmpp.key.pem') }}" +xmpp_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_xmpp.cert.pem') }}" +xmpp_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_xmpp.key.pem') }}" # common ca_certificates: diff --git a/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml b/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml index fa23af5d9f8c7482d6fb1ec3a1878de9dae1983b..03f50d157ea8f309f44fc6020922f77ec2e832d6 100644 --- a/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml +++ b/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml @@ -10,8 +10,8 @@ xmpp_ldap_base_dn: dc=local xmpp_ldap_password: prosodypassword xmpp_ldap_server: ldap-server xmpp_server_archive_expiration: "1w" -xmpp_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_xmpp.cert.pem') }}" -xmpp_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_xmpp.key.pem') }}" +xmpp_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_xmpp.cert.pem') }}" +xmpp_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_xmpp.key.pem') }}" xmpp_server_tls_protocol: "tlsv1_3+" # At least one non-TLSv1.3 cipher has to be included in order to # ensure TLSv1.3 gets initialised. TLSv1.3 ciphers (TLS_*) are not