internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-08-05 22:34:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #351 from rjeffman/fix_password_location_tests

Browse Source 
Missing admin passwords in location module.
This commit is contained in:
Thomas Woerner
2020-08-14 20:04:04 +02:00
committed by GitHub
parent 33db65374b b7722a476f
commit f013f98a0f
5 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README-location.md
View File

@@ -49,6 +49,7 @@ Example playbook to make sure location "my_location1" is present:
tasks: tasks:
- ipalocation: - ipalocation:
ipaadmin_password: SomeADMINpassword
name: my_location1 name: my_location1
description: My Location 1 description: My Location 1
``` ```
@@ -64,6 +65,7 @@ Example playbook to make sure location "my_location1" is absent:
tasks: tasks:
- ipalocation: - ipalocation:
ipaadmin_password: SomeADMINpassword
name: my_location1 name: my_location1
state: absent state: absent
``` ```

5
playbooks/location/location-absent.yml
View File

@@ -6,5 +6,6 @@
tasks: tasks:
- name: Ensure location my_location1 is absent - name: Ensure location my_location1 is absent
ipalocation: ipalocation:
name: my_location1 ipaadmin_password: SomeADMINpassword
state: absent name: my_location1
state: absent

3
playbooks/location/location-present.yml
View File

@@ -6,4 +6,5 @@
tasks: tasks:
- name: Ensure location my_location1 is present - name: Ensure location my_location1 is present
ipalocation: ipalocation:
name: my_location1 ipaadmin_password: SomeADMINpassword
name: my_location1

2
plugins/modules/ipalocation.py
View File

@@ -55,11 +55,13 @@ options:
EXAMPLES = """ EXAMPLES = """
# Ensure location my_location1 is present # Ensure location my_location1 is present
- ipalocation: - ipalocation:
ipaadmin_password: SomeADMINpassword
name: my_location1 name: my_location1
description: My location 1 description: My location 1
# Ensure location my_location1 is absent # Ensure location my_location1 is absent
- ipalocation: - ipalocation:
ipaadmin_password: SomeADMINpassword
name: my_location1 name: my_location1
state: absent state: absent
""" """

36
tests/location/test_location.yml
View File

@@ -9,8 +9,9 @@
- name: Ensure location my_location1 is absent - name: Ensure location my_location1 is absent
ipalocation: ipalocation:
name: my_location1 ipaadmin_password: SomeADMINpassword
state: absent name: my_location1
state: absent
# CREATE TEST ITEMS # CREATE TEST ITEMS
@@ -18,41 +19,47 @@
- name: Ensure location my_location1 is present - name: Ensure location my_location1 is present
ipalocation: ipalocation:
name: my_location1 ipaadmin_password: SomeADMINpassword
name: my_location1
register: result register: result
failed_when: not result.changed or result.failed failed_when: not result.changed or result.failed
- name: Ensure location my_location1 is present again - name: Ensure location my_location1 is present again
ipalocation: ipalocation:
name: my_location1 ipaadmin_password: SomeADMINpassword
name: my_location1
register: result register: result
failed_when: result.changed or result.failed failed_when: result.changed or result.failed
- name: Ensure location my_location1 is present with description - name: Ensure location my_location1 is present with description
ipalocation: ipalocation:
name: my_location1 ipaadmin_password: SomeADMINpassword
description: My Location 1 name: my_location1
description: My Location 1
register: result register: result
failed_when: not result.changed or result.failed failed_when: not result.changed or result.failed
- name: Ensure location my_location1 is present again with description - name: Ensure location my_location1 is present again with description
ipalocation: ipalocation:
name: my_location1 ipaadmin_password: SomeADMINpassword
description: My Location 1 name: my_location1
description: My Location 1
register: result register: result
failed_when: result.changed or result.failed failed_when: result.changed or result.failed
- name: Ensure location my_location1 is absent - name: Ensure location my_location1 is absent
ipalocation: ipalocation:
name: my_location1 ipaadmin_password: SomeADMINpassword
state: absent name: my_location1
state: absent
register: result register: result
failed_when: not result.changed or result.failed failed_when: not result.changed or result.failed
- name: Ensure location my_location1 is absent again - name: Ensure location my_location1 is absent again
ipalocation: ipalocation:
name: my_location1 ipaadmin_password: SomeADMINpassword
state: absent name: my_location1
state: absent
register: result register: result
failed_when: result.changed or result.failed failed_when: result.changed or result.failed
@@ -60,5 +67,6 @@
- name: Ensure location my_location1 is absent - name: Ensure location my_location1 is absent
ipalocation: ipalocation:
name: my_location1 ipaadmin_password: SomeADMINpassword
state: absent name: my_location1
state: absent