majic-ansible-roles Changeset

Changeset - 1e88ff36efbd

Parent rev.

Child rev.

[Not reviewed]

0 9 0

Branko Majic (branko) - 2 months ago 2025-02-02 21:40:16
branko@majic.rs

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).

9 files changed with 15 insertions and 15 deletions:

roles/backup_client/molecule/default/group_vars/parameters-optional.yml

roles/ldap_server/molecule/default/group_vars/parameters-mandatory.yml

roles/ldap_server/molecule/default/group_vars/parameters-optional.yml

roles/php_website/molecule/default/prepare.yml

roles/web_server/molecule/default/group_vars/parameters-mandatory.yml

roles/web_server/molecule/default/group_vars/parameters-optional.yml

roles/wsgi_website/molecule/default/prepare.yml

roles/xmpp_server/molecule/default/group_vars/parameters-mandatory.yml

roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml

0 comments (0 inline, 0 general) First comment

roles/backup_client/molecule/default/group_vars/parameters-optional.yml

➞

Show inline comments

@@ @@ -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') }}"

roles/ldap_server/molecule/default/group_vars/parameters-mandatory.yml

➞

Show inline comments

@@ @@ -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:

roles/ldap_server/molecule/default/group_vars/parameters-optional.yml

➞

Show inline comments

@@ @@ -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

roles/php_website/molecule/default/prepare.yml

➞

Show inline comments

@@ @@ -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

roles/web_server/molecule/default/group_vars/parameters-mandatory.yml

➞

Show inline comments

 ---
 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:

roles/web_server/molecule/default/group_vars/parameters-optional.yml

➞

Show inline comments

 ---
 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"

roles/wsgi_website/molecule/default/prepare.yml

➞

Show inline comments

@@ @@ -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

roles/xmpp_server/molecule/default/group_vars/parameters-mandatory.yml

➞

Show inline comments

@@ @@ -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:

roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml

➞

Show inline comments

@@ @@ -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

0 comments (0 inline, 0 general) First comment