mirror of
https://github.com/freeipa/ansible-freeipa.git
synced 2026-07-25 00:44:42 +00:00
Fix lookup for certicates in tests
The file lookup is by default setting `rstrip=True` which could lead into a stripped new line. This is not happening always but resulted in failed tests sometimes with certificates pasted to the b64encode filter. For calls of lookup in the certificae tests `rstrip=False` has been added to make sure that this is not happening any more. Not in test_dnsrecord as lookup(..., rstrip=False) is adding a new line if there was not a new line and this is an issue for dnsrecord. The user and host tests have also been simplified to create the base64 encoded file in the beginning and use this file then later on in the tests without the need to use the b64encode filter. Ref: https://github.com/ansible/ansible/issues/57521#issuecomment-502238000
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user