majic-ansible-roles Changeset

Changeset - bba096126140

Parent rev.

Child rev.

[Not reviewed]

6 5 1

Branko Majic (branko) - 4 years ago 2020-08-26 19:32:45
branko@majic.rs

MAR-150: Use fixtures for X.509 artefacts in the ldap_server role:

- Removed the statically generated artefacts.
- Generate X.509 artefacts for tests using Gimmecert.
- Updated paths to point to generated artefacts.
- Introduced cleanup playbook for removing generated artefacts.

12 files changed with 58 insertions and 533 deletions:

roles/ldap_server/molecule/default/cleanup.yml

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

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

roles/ldap_server/molecule/default/molecule.yml

roles/ldap_server/molecule/default/prepare.yml

roles/ldap_server/molecule/default/tests/data/x509/ca.cert.pem

roles/ldap_server/molecule/default/tests/data/x509/ca.key.pem

182

roles/ldap_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64.local_ldap.cert.pem

roles/ldap_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64.local_ldap.key.pem

134

roles/ldap_server/molecule/default/tests/data/x509/parameters-optional-stretch64_ldap.cert.pem

roles/ldap_server/molecule/default/tests/data/x509/parameters-optional-stretch64_ldap.key.pem

134

roles/ldap_server/molecule/default/tests/test_default.py

0 comments (0 inline, 0 general)

roles/ldap_server/molecule/default/cleanup.yml

➞

Show inline comments

@@ new file 100644 @@
 ---
 - name: Clean-up fixtures
   hosts: localhost
   connection: local
   gather_facts: false
   tasks:
     - name: Remove X.509 material
       file:
         path: "{{ item }}"
         state: absent
       with_items:
         - "tests/data/x509"
         - "tests/data/.gimmecert"

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

➞

Show inline comments

@@ @@ -2,8 +2,8 @@ @@
 ldap_admin_password: adminpassword
 ldap_server_tls_certificate: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_ldap.cert.pem') }}"
 ldap_server_tls_key: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_ldap.key.pem') }}"
 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_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/{{ inventory_hostname }}_ldap.cert.pem') }}"
 ldap_server_tls_key: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_ldap.key.pem') }}"
 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_entries:
   - dn: uid=john,dc=local

roles/ldap_server/molecule/default/molecule.yml

➞

Show inline comments

@@ @@ -51,6 +51,8 @@ platforms: @@
 provisioner:
   name: ansible
   playbooks:
     cleanup: cleanup.yml
   config_options:
     defaults:
       force_valid_group_names: "ignore"

roles/ldap_server/molecule/default/prepare.yml

➞

Show inline comments

 ---
 - name: Set-up fixtures
   hosts: localhost
   connection: local
   gather_facts: false
   tasks:
     - name: Initialise CA hierarchy
       command: "gimmecert init"
       args:
         creates: "tests/data/.gimmecert/ca/level1.cert.pem"
         chdir: "tests/data/"
     - name: Generate server private keys and certificates
       command:
       args:
         chdir: "tests/data/"
         creates: "tests/data/.gimmecert/server/{{ item.name }}.cert.pem"
         argv:
           - "gimmecert"
           - "server"
           - "{{ item.name }}"
           - "{{ item.fqdn }}"
       with_items:
         - name: parameters-mandatory-stretch64.local_ldap
           fqdn: parameters-mandatory.local
         - name: parameters-optional-stretch64_ldap
           fqdn: parameters-optional
     - name: Set-up link to generated X.509 material
       file:
         src: ".gimmecert"
         dest: "tests/data/x509"
         state: link
 - name: Prepare
   hosts: all
   gather_facts: false
@@ @@ -20,7 +54,7 @@ @@
     - name: Deploy CA certificate
       copy:
         src: tests/data/x509/ca.cert.pem
+        src: tests/data/x509/ca/level1.cert.pem
         dest: /etc/ssl/certs/testca.cert.pem
         owner: root
         group: root

roles/ldap_server/molecule/default/tests/data/x509/ca.cert.pem

➞

Show inline comments

deleted file

roles/ldap_server/molecule/default/tests/data/x509/ca.key.pem

➞

Show inline comments

deleted file

roles/ldap_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64.local_ldap.cert.pem

➞

Show inline comments

deleted file

roles/ldap_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64.local_ldap.key.pem

➞

Show inline comments

deleted file

roles/ldap_server/molecule/default/tests/data/x509/parameters-optional-stretch64_ldap.cert.pem

➞

Show inline comments

deleted file

roles/ldap_server/molecule/default/tests/data/x509/parameters-optional-stretch64_ldap.key.pem

➞

Show inline comments

deleted file

roles/ldap_server/molecule/default/tests/test_default.py

➞

Show inline comments

@@ @@ -211,7 +211,7 @@ def test_ldap_tls_private_key_file(host): @@
         assert key.user == 'root'
         assert key.group == 'openldap'
         assert key.mode == 0o640
         assert key.content_string == open('tests/data/x509/%s_ldap.key.pem' % inventory_hostname).read()
+        assert key.content_string == open('tests/data/x509/server/%s_ldap.key.pem' % inventory_hostname).read()
 def test_ldap_tls_certificate_file(host):
@@ @@ -229,4 +229,4 @@ def test_ldap_tls_certificate_file(host): @@
         assert cert.user == 'root'
         assert cert.group == 'root'
         assert cert.mode == 0o644
         assert cert.content_string == open('tests/data/x509/%s_ldap.cert.pem' % inventory_hostname).read()
+        assert cert.content_string == open('tests/data/x509/server/%s_ldap.cert.pem' % inventory_hostname).read()

0 comments (0 inline, 0 general)