diff --git a/tests/dnsrecord/test_dnsrecord.yml b/tests/dnsrecord/test_dnsrecord.yml index 9e6cce9fb93ac0cdc3d6abdc6dee0195f6b37c09..a0629bb306e88e584121b5463acf38c9eee2e83a 100644 --- a/tests/dnsrecord/test_dnsrecord.yml +++ b/tests/dnsrecord/test_dnsrecord.yml @@ -14,6 +14,7 @@ cmd: | openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test' openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der" + base64 "cert{{ item }}.der" -w5000 > "cert{{ item }}.b64" with_items: [1] become: no delegate_to: localhost @@ -686,7 +687,7 @@ cert_type: 1 cert_key_tag: 1234 cert_algorithm: 3 - cert_certificate_or_crl: "{{ lookup('file', 'cert1.der') | b64encode }}" + cert_certificate_or_crl: "{{ lookup('file', 'cert1.b64') }}" register: result failed_when: not result.changed @@ -698,7 +699,7 @@ cert_type: 1 cert_key_tag: 1234 cert_algorithm: 3 - cert_certificate_or_crl: "{{ lookup('file', 'cert1.der') | b64encode }}" + cert_certificate_or_crl: "{{ lookup('file', 'cert1.b64') }}" register: result failed_when: result.changed @@ -707,7 +708,7 @@ ipaadmin_password: SomeADMINpassword zone_name: "{{ testzone }}" name: host04 - cert_rec: "1 1234 3 {{ lookup('file', 'cert1.der') | b64encode }}" + cert_rec: "1 1234 3 {{ lookup('file', 'cert1.b64') }}" state: absent register: result failed_when: not result.changed @@ -717,7 +718,7 @@ ipaadmin_password: SomeADMINpassword zone_name: "{{ testzone }}" name: host04 - cert_rec: 1 1234 3 "{{ lookup('file', 'cert1.der') | b64encode }}" + cert_rec: 1 1234 3 "{{ lookup('file', 'cert1.b64') }}" state: absent register: result failed_when: result.changed @@ -1354,7 +1355,7 @@ - name: Remove certificate files. shell: - cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" + cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64" with_items: [1] become: no delegate_to: localhost diff --git a/tests/host/certificate/test_host_certificate.yml b/tests/host/certificate/test_host_certificate.yml index e49772c02e973a1ef5a32a6f3fe2b70fd14cbb81..c4149491af2316b2c121739943a6479884459305 100644 --- a/tests/host/certificate/test_host_certificate.yml +++ b/tests/host/certificate/test_host_certificate.yml @@ -14,6 +14,7 @@ cmd: | openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test' openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der" + base64 "cert{{ item }}.der" -w5000 > "cert{{ item }}.b64" with_items: [1, 2, 3] become: no delegate_to: localhost @@ -37,9 +38,9 @@ ipaadmin_password: SomeADMINpassword name: "{{ 'test.' + ipaserver_domain }}" certificate: - - "{{ lookup('file', 'cert1.der') | b64encode }}" - - "{{ lookup('file', 'cert2.der') | b64encode }}" - - "{{ lookup('file', 'cert3.der') | b64encode }}" + - "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert3.b64', rstrip=False) }}" action: member register: result failed_when: not result.changed @@ -49,9 +50,9 @@ ipaadmin_password: SomeADMINpassword name: "{{ 'test.' + ipaserver_domain }}" certificate: - - "{{ lookup('file', 'cert1.der') | b64encode }}" - - "{{ lookup('file', 'cert2.der') | b64encode }}" - - "{{ lookup('file', 'cert3.der') | b64encode }}" + - "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert3.b64', rstrip=False) }}" action: member register: result failed_when: result.changed @@ -61,9 +62,9 @@ ipaadmin_password: SomeADMINpassword name: "{{ 'test.' + ipaserver_domain }}" certificate: - - "{{ lookup('file', 'cert1.der') | b64encode }}" - - "{{ lookup('file', 'cert2.der') | b64encode }}" - - "{{ lookup('file', 'cert3.der') | b64encode }}" + - "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert3.b64', rstrip=False) }}" state: absent action: member register: result @@ -74,9 +75,9 @@ ipaadmin_password: SomeADMINpassword name: "{{ 'test.' + ipaserver_domain }}" certificate: - - "{{ lookup('file', 'cert1.der') | b64encode }}" - - "{{ lookup('file', 'cert2.der') | b64encode }}" - - "{{ lookup('file', 'cert3.der') | b64encode }}" + - "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert3.b64', rstrip=False) }}" state: absent action: member register: result @@ -100,7 +101,7 @@ - name: Remove certificate files. shell: - cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" + cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64" with_items: [1, 2, 3] become: no delegate_to: localhost diff --git a/tests/host/certificate/test_hosts_certificate.yml b/tests/host/certificate/test_hosts_certificate.yml index 7b826b868d4f0a77143f0eec577f161eb8825775..f2ef1a22ae262aa26e7aedc6844a24dc123bb024 100644 --- a/tests/host/certificate/test_hosts_certificate.yml +++ b/tests/host/certificate/test_hosts_certificate.yml @@ -30,6 +30,7 @@ cmd: | openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test' openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der" + base64 "cert{{ item }}.der" -w5000 > "cert{{ item }}.b64" with_items: [1, 2, 3] become: no delegate_to: localhost @@ -40,9 +41,9 @@ hosts: - name: "{{ 'test.' + ipaserver_domain }}" certificate: - - "{{ lookup('file', 'cert1.der') | b64encode }}" - - "{{ lookup('file', 'cert2.der') | b64encode }}" - - "{{ lookup('file', 'cert3.der') | b64encode }}" + - "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert3.b64', rstrip=False) }}" action: member register: result failed_when: not result.changed @@ -53,9 +54,9 @@ hosts: - name: "{{ 'test.' + ipaserver_domain }}" certificate: - - "{{ lookup('file', 'cert1.der') | b64encode }}" - - "{{ lookup('file', 'cert2.der') | b64encode }}" - - "{{ lookup('file', 'cert3.der') | b64encode }}" + - "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert3.b64', rstrip=False) }}" action: member register: result failed_when: result.changed @@ -66,9 +67,9 @@ hosts: - name: "{{ 'test.' + ipaserver_domain }}" certificate: - - "{{ lookup('file', 'cert1.der') | b64encode }}" - - "{{ lookup('file', 'cert2.der') | b64encode }}" - - "{{ lookup('file', 'cert3.der') | b64encode }}" + - "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert3.b64', rstrip=False) }}" state: absent action: member #register: result @@ -80,9 +81,9 @@ hosts: - name: "{{ 'test.' + ipaserver_domain }}" certificate: - - "{{ lookup('file', 'cert1.der') | b64encode }}" - - "{{ lookup('file', 'cert2.der') | b64encode }}" - - "{{ lookup('file', 'cert3.der') | b64encode }}" + - "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert3.b64', rstrip=False) }}" state: absent action: member register: result @@ -99,7 +100,7 @@ - name: Remove certificate files. shell: - cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" + cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64" with_items: [1, 2, 3] become: no delegate_to: localhost diff --git a/tests/user/certificate/test_user_certificate.yml b/tests/user/certificate/test_user_certificate.yml index 77e52cb89c3e417ca3b024d6de8f41528782790d..d1e157fdf5d51eef482e79300bb026b699204dc4 100644 --- a/tests/user/certificate/test_user_certificate.yml +++ b/tests/user/certificate/test_user_certificate.yml @@ -10,6 +10,7 @@ cmd: | openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test' openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der" + base64 "cert{{ item }}.der" -w5000 > "cert{{ item }}.b64" with_items: [1, 2, 3] become: no delegate_to: localhost @@ -26,9 +27,9 @@ ipaadmin_password: SomeADMINpassword name: test certificate: - - "{{ lookup('file', 'cert1.der') | b64encode }}" - - "{{ lookup('file', 'cert2.der') | b64encode }}" - - "{{ lookup('file', 'cert3.der') | b64encode }}" + - "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert3.b64', rstrip=False) }}" action: member register: result failed_when: not result.changed @@ -40,9 +41,9 @@ first: test last: test certificate: - - "{{ lookup('file', 'cert1.der') | b64encode }}" - - "{{ lookup('file', 'cert2.der') | b64encode }}" - - "{{ lookup('file', 'cert3.der') | b64encode }}" + - "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert3.b64', rstrip=False) }}" action: member register: result failed_when: result.changed @@ -52,9 +53,9 @@ ipaadmin_password: SomeADMINpassword name: test certificate: - - "{{ lookup('file', 'cert1.der') | b64encode }}" - - "{{ lookup('file', 'cert2.der') | b64encode }}" - - "{{ lookup('file', 'cert3.der') | b64encode }}" + - "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert3.b64', rstrip=False) }}" state: absent action: member register: result @@ -65,9 +66,9 @@ ipaadmin_password: SomeADMINpassword name: test certificate: - - "{{ lookup('file', 'cert1.der') | b64encode }}" - - "{{ lookup('file', 'cert2.der') | b64encode }}" - - "{{ lookup('file', 'cert3.der') | b64encode }}" + - "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert3.b64', rstrip=False) }}" state: absent action: member register: result @@ -83,7 +84,7 @@ - name: Remove certificate files. shell: - cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" + cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64" with_items: [1, 2, 3] become: no delegate_to: localhost diff --git a/tests/user/certificate/test_users_certificate.yml b/tests/user/certificate/test_users_certificate.yml index 4b3d2cbd5b89cbc27b174231f9638e621e4e7201..78198016d548b296f4872f4feeabb83ad9f8e6c5 100644 --- a/tests/user/certificate/test_users_certificate.yml +++ b/tests/user/certificate/test_users_certificate.yml @@ -10,6 +10,7 @@ cmd: | openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test' openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der" + base64 "cert{{ item }}.der" -w5000 > "cert{{ item }}.b64" with_items: [1, 2, 3] become: no delegate_to: localhost @@ -35,9 +36,9 @@ users: - name: test certificate: - - "{{ lookup('file', 'cert1.der') | b64encode }}" - - "{{ lookup('file', 'cert2.der') | b64encode }}" - - "{{ lookup('file', 'cert3.der') | b64encode }}" + - "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert3.b64', rstrip=False) }}" action: member register: result failed_when: not result.changed @@ -48,9 +49,9 @@ users: - name: test certificate: - - "{{ lookup('file', 'cert1.der') | b64encode }}" - - "{{ lookup('file', 'cert2.der') | b64encode }}" - - "{{ lookup('file', 'cert3.der') | b64encode }}" + - "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert3.b64', rstrip=False) }}" action: member register: result failed_when: result.changed @@ -61,9 +62,9 @@ users: - name: test certificate: - - "{{ lookup('file', 'cert1.der') | b64encode }}" - - "{{ lookup('file', 'cert2.der') | b64encode }}" - - "{{ lookup('file', 'cert3.der') | b64encode }}" + - "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert3.b64', rstrip=False) }}" state: absent action: member #register: result @@ -75,9 +76,9 @@ users: - name: test certificate: - - "{{ lookup('file', 'cert1.der') | b64encode }}" - - "{{ lookup('file', 'cert2.der') | b64encode }}" - - "{{ lookup('file', 'cert3.der') | b64encode }}" + - "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert3.b64', rstrip=False) }}" state: absent action: member register: result @@ -94,7 +95,7 @@ - name: Remove certificate files. shell: - cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" + cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64" with_items: [1, 2, 3] become: no delegate_to: localhost diff --git a/tests/user/certmapdata/test_user_certmapdata.yml b/tests/user/certmapdata/test_user_certmapdata.yml index afb9a1db14f43491fb64014ef277f34c20273a97..79df66c316dcbbc326611ba5afb40dc12a7e3541 100644 --- a/tests/user/certmapdata/test_user_certmapdata.yml +++ b/tests/user/certmapdata/test_user_certmapdata.yml @@ -10,6 +10,7 @@ cmd: | openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test' openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der" + base64 "cert{{ item }}.der" -w5000 > "cert{{ item }}.b64" with_items: [1, 2, 3] become: no delegate_to: localhost @@ -34,9 +35,9 @@ ipaadmin_password: SomeADMINpassword name: test certmapdata: - - certificate: "{{ lookup('file', 'cert1.der') | b64encode }}" - - certificate: "{{ lookup('file', 'cert2.der') | b64encode }}" - - certificate: "{{ lookup('file', 'cert3.der') | b64encode }}" + - certificate: "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - certificate: "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - certificate: "{{ lookup('file', 'cert3.b64', rstrip=False) }}" action: member register: result failed_when: not result.changed @@ -46,9 +47,9 @@ ipaadmin_password: SomeADMINpassword name: test certmapdata: - - certificate: "{{ lookup('file', 'cert1.der') | b64encode }}" - - certificate: "{{ lookup('file', 'cert2.der') | b64encode }}" - - certificate: "{{ lookup('file', 'cert3.der') | b64encode }}" + - certificate: "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - certificate: "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - certificate: "{{ lookup('file', 'cert3.b64', rstrip=False) }}" action: member register: result failed_when: result.changed @@ -58,9 +59,9 @@ ipaadmin_password: SomeADMINpassword name: test certmapdata: - - certificate: "{{ lookup('file', 'cert1.der') | b64encode }}" - - certificate: "{{ lookup('file', 'cert2.der') | b64encode }}" - - certificate: "{{ lookup('file', 'cert3.der') | b64encode }}" + - certificate: "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - certificate: "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - certificate: "{{ lookup('file', 'cert3.b64', rstrip=False) }}" action: member state: absent register: result @@ -71,9 +72,9 @@ ipaadmin_password: SomeADMINpassword name: test certmapdata: - - certificate: "{{ lookup('file', 'cert1.der') | b64encode }}" - - certificate: "{{ lookup('file', 'cert2.der') | b64encode }}" - - certificate: "{{ lookup('file', 'cert3.der') | b64encode }}" + - certificate: "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - certificate: "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - certificate: "{{ lookup('file', 'cert3.b64', rstrip=False) }}" action: member state: absent register: result @@ -226,7 +227,7 @@ - name: Remove certificate files. shell: - cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" + cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64" with_items: [1, 2, 3] become: no delegate_to: localhost diff --git a/tests/user/certmapdata/test_users_certmapdata.yml b/tests/user/certmapdata/test_users_certmapdata.yml index 4b154208e80b472b495800683eaeac589e3a0ccd..fdde23f40aa518472a9a776a78a21f6fb2602eee 100644 --- a/tests/user/certmapdata/test_users_certmapdata.yml +++ b/tests/user/certmapdata/test_users_certmapdata.yml @@ -10,6 +10,7 @@ cmd: | openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test' openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der" + base64 "cert{{ item }}.der" -w5000 > "cert{{ item }}.b64" with_items: [1, 2, 3] become: no delegate_to: localhost @@ -37,9 +38,9 @@ users: - name: test certmapdata: - - certificate: "{{ lookup('file', 'cert1.der') | b64encode }}" - - certificate: "{{ lookup('file', 'cert2.der') | b64encode }}" - - certificate: "{{ lookup('file', 'cert3.der') | b64encode }}" + - certificate: "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - certificate: "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - certificate: "{{ lookup('file', 'cert3.b64', rstrip=False) }}" action: member register: result failed_when: not result.changed @@ -50,9 +51,9 @@ users: - name: test certmapdata: - - certificate: "{{ lookup('file', 'cert1.der') | b64encode }}" - - certificate: "{{ lookup('file', 'cert2.der') | b64encode }}" - - certificate: "{{ lookup('file', 'cert3.der') | b64encode }}" + - certificate: "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - certificate: "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - certificate: "{{ lookup('file', 'cert3.b64', rstrip=False) }}" action: member register: result failed_when: result.changed @@ -63,9 +64,9 @@ users: - name: test certmapdata: - - certificate: "{{ lookup('file', 'cert1.der') | b64encode }}" - - certificate: "{{ lookup('file', 'cert2.der') | b64encode }}" - - certificate: "{{ lookup('file', 'cert3.der') | b64encode }}" + - certificate: "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - certificate: "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - certificate: "{{ lookup('file', 'cert3.b64', rstrip=False) }}" action: member state: absent register: result @@ -77,9 +78,9 @@ users: - name: test certmapdata: - - certificate: "{{ lookup('file', 'cert1.der') | b64encode }}" - - certificate: "{{ lookup('file', 'cert2.der') | b64encode }}" - - certificate: "{{ lookup('file', 'cert3.der') | b64encode }}" + - certificate: "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - certificate: "{{ lookup('file', 'cert2.b64', rstrip=False) }}" + - certificate: "{{ lookup('file', 'cert3.b64', rstrip=False) }}" action: member state: absent register: result @@ -162,7 +163,7 @@ - name: Remove certificate files. shell: - cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" + cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64" with_items: [1, 2, 3] become: no delegate_to: localhost diff --git a/tests/user/test_users_invalid_cert.yml b/tests/user/test_users_invalid_cert.yml index a5951a6accec32e871b44bf0b3775c70a512f273..d482d300325eb0db5f490a26df5c1cd0e08b4479 100644 --- a/tests/user/test_users_invalid_cert.yml +++ b/tests/user/test_users_invalid_cert.yml @@ -10,6 +10,7 @@ cmd: | openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test' openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der" + base64 "cert{{ item }}.der" -w5000 > "cert{{ item }}.b64" with_items: [1, 2] become: no delegate_to: localhost @@ -35,7 +36,7 @@ users: - name: test certificate: - - "{{ lookup('file', 'cert1.der') | b64encode }}" + - "{{ lookup('file', 'cert1.b64', rstrip=False) }}" action: member register: result failed_when: not result.changed @@ -46,8 +47,8 @@ users: - name: test certificate: - - "{{ lookup('file', 'cert1.der') | b64encode }}" - - "{{ lookup('file', 'cert2.der') | b64encode }}" + - "{{ lookup('file', 'cert1.b64', rstrip=False) }}" + - "{{ lookup('file', 'cert2.b64', rstrip=False) }}" state: absent action: member #register: result @@ -55,7 +56,7 @@ - name: Remove certificate files. shell: - cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" + cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64" with_items: [1, 2] become: no delegate_to: localhost diff --git a/tests/vault/tasks_vault_members.yml b/tests/vault/tasks_vault_members.yml index 1cbf0473d90eabb17af8f8799a5b90ad361a0c8a..2f975681612e411f43be8fcb55a70f999423a6eb 100644 --- a/tests/vault/tasks_vault_members.yml +++ b/tests/vault/tasks_vault_members.yml @@ -27,7 +27,7 @@ ipaadmin_password: SomeADMINpassword name: "{{vault.name}}" vault_type: "{{vault.vault_type}}" - public_key: "{{lookup('file', 'private.pem') | b64encode}}" + public_key: "{{lookup('file', 'private.pem', rstrip=False) | b64encode}}" register: result failed_when: not result.changed when: vault.vault_type == 'asymmetric' diff --git a/tests/vault/test_vault_asymmetric.yml b/tests/vault/test_vault_asymmetric.yml index f229b6bb099c8add23555cf52a6e244c14d7096b..f9ab9fdc9f39615f27ffd5ebf612c939ad5b3ca6 100644 --- a/tests/vault/test_vault_asymmetric.yml +++ b/tests/vault/test_vault_asymmetric.yml @@ -14,7 +14,7 @@ ipaadmin_password: SomeADMINpassword name: asymvault vault_type: asymmetric - public_key: "{{ lookup('file', 'public.pem') | b64encode }}" + public_key: "{{ lookup('file', 'public.pem', rstrip=False) | b64encode }}" register: result failed_when: not result.changed @@ -23,7 +23,7 @@ ipaadmin_password: SomeADMINpassword name: asymvault vault_type: asymmetric - public_key: "{{ lookup('file', 'public.pem') | b64encode }}" + public_key: "{{ lookup('file', 'public.pem', rstrip=False) | b64encode }}" register: result failed_when: result.changed @@ -39,7 +39,7 @@ ipavault: ipaadmin_password: SomeADMINpassword name: asymvault - private_key: "{{ lookup('file', 'private.pem') | b64encode }}" + private_key: "{{ lookup('file', 'private.pem', rstrip=False) | b64encode }}" state: retrieved register: result failed_when: result.vault.data != 'SomeADMINpassword' or result.changed @@ -56,7 +56,7 @@ ipavault: ipaadmin_password: SomeADMINpassword name: asymvault - private_key: "{{ lookup('file', 'private.pem') | b64encode }}" + private_key: "{{ lookup('file', 'private.pem', rstrip=False) | b64encode }}" state: retrieved register: result failed_when: result.vault.data != 'Hello World.' or result.changed @@ -66,7 +66,7 @@ ipaadmin_password: SomeADMINpassword name: asymvault out: "{{ ansible_env.HOME }}/data.txt" - private_key: "{{ lookup('file', 'private.pem') | b64encode }}" + private_key: "{{ lookup('file', 'private.pem', rstrip=False) | b64encode }}" state: retrieved register: result failed_when: result.changed or result.failed or (result.vault.data | default(false)) @@ -89,7 +89,7 @@ ipavault: ipaadmin_password: SomeADMINpassword name: asymvault - private_key: "{{ lookup('file', 'private.pem') | b64encode }}" + private_key: "{{ lookup('file', 'private.pem', rstrip=False) | b64encode }}" state: retrieved register: result failed_when: result.vault.data != 'The world of π is half rounded.' or result.changed @@ -107,7 +107,7 @@ ipavault: ipaadmin_password: SomeADMINpassword name: asymvault - private_key: "{{ lookup('file', 'private.pem') | b64encode }}" + private_key: "{{ lookup('file', 'private.pem', rstrip=False) | b64encode }}" state: retrieved register: result failed_when: result.vault.data != 'Another World.' or result.changed @@ -124,7 +124,7 @@ ipavault: ipaadmin_password: SomeADMINpassword name: asymvault - private_key: "{{ lookup('file', 'private.pem') | b64encode }}" + private_key: "{{ lookup('file', 'private.pem', rstrip=False) | b64encode }}" state: retrieved register: result failed_when: result.vault.data != 'c' or result.changed @@ -175,7 +175,7 @@ ipavault: ipaadmin_password: SomeADMINpassword name: asymvault - private_key: "{{ lookup('file', 'private.pem') | b64encode }}" + private_key: "{{ lookup('file', 'private.pem', rstrip=False) | b64encode }}" state: retrieved register: result failed_when: result.vault.data != 'Hello World.' or result.changed