diff --git a/README-location.md b/README-location.md index 81a7033de8991018a9c59966f8ca4a94f05e0bfe..3e9b7ef161ffb0e3080bc03bad92816edc8d55ab 100644 --- a/README-location.md +++ b/README-location.md @@ -49,6 +49,7 @@ Example playbook to make sure location "my_location1" is present: tasks: - ipalocation: + ipaadmin_password: SomeADMINpassword name: my_location1 description: My Location 1 ``` @@ -64,6 +65,7 @@ Example playbook to make sure location "my_location1" is absent: tasks: - ipalocation: + ipaadmin_password: SomeADMINpassword name: my_location1 state: absent ``` diff --git a/playbooks/location/location-absent.yml b/playbooks/location/location-absent.yml index aa99fe6ffebe5ca948b8dac036452884a5ac6146..33e3bab20920eb55766509699a2566fd8332501d 100644 --- a/playbooks/location/location-absent.yml +++ b/playbooks/location/location-absent.yml @@ -6,5 +6,6 @@ tasks: - name: Ensure location my_location1 is absent ipalocation: - name: my_location1 - state: absent + ipaadmin_password: SomeADMINpassword + name: my_location1 + state: absent diff --git a/playbooks/location/location-present.yml b/playbooks/location/location-present.yml index 76d44a52c39e8837a7b080e863630aaafbe894b9..17ffaacfafcafcc5c5fdd1c5d920418b94e1fb6d 100644 --- a/playbooks/location/location-present.yml +++ b/playbooks/location/location-present.yml @@ -6,4 +6,5 @@ tasks: - name: Ensure location my_location1 is present ipalocation: - name: my_location1 + ipaadmin_password: SomeADMINpassword + name: my_location1 diff --git a/plugins/modules/ipalocation.py b/plugins/modules/ipalocation.py index a36596cff6d2ce9a3c48425701902554e31ff9fa..a7439df465a69e12e722125277a1172d85b50eda 100644 --- a/plugins/modules/ipalocation.py +++ b/plugins/modules/ipalocation.py @@ -55,11 +55,13 @@ options: EXAMPLES = """ # Ensure location my_location1 is present - ipalocation: + ipaadmin_password: SomeADMINpassword name: my_location1 description: My location 1 # Ensure location my_location1 is absent - ipalocation: + ipaadmin_password: SomeADMINpassword name: my_location1 state: absent """ diff --git a/tests/location/test_location.yml b/tests/location/test_location.yml index c267d06316504a34cf1f907658e70e108994198f..10aed32fda68072b754e2226ad1d04584d593bd5 100644 --- a/tests/location/test_location.yml +++ b/tests/location/test_location.yml @@ -9,8 +9,9 @@ - name: Ensure location my_location1 is absent ipalocation: - name: my_location1 - state: absent + ipaadmin_password: SomeADMINpassword + name: my_location1 + state: absent # CREATE TEST ITEMS @@ -18,41 +19,47 @@ - name: Ensure location my_location1 is present ipalocation: - name: my_location1 + ipaadmin_password: SomeADMINpassword + name: my_location1 register: result failed_when: not result.changed or result.failed - name: Ensure location my_location1 is present again ipalocation: - name: my_location1 + ipaadmin_password: SomeADMINpassword + name: my_location1 register: result failed_when: result.changed or result.failed - name: Ensure location my_location1 is present with description ipalocation: - name: my_location1 - description: My Location 1 + ipaadmin_password: SomeADMINpassword + name: my_location1 + description: My Location 1 register: result failed_when: not result.changed or result.failed - name: Ensure location my_location1 is present again with description ipalocation: - name: my_location1 - description: My Location 1 + ipaadmin_password: SomeADMINpassword + name: my_location1 + description: My Location 1 register: result failed_when: result.changed or result.failed - name: Ensure location my_location1 is absent ipalocation: - name: my_location1 - state: absent + ipaadmin_password: SomeADMINpassword + name: my_location1 + state: absent register: result failed_when: not result.changed or result.failed - name: Ensure location my_location1 is absent again ipalocation: - name: my_location1 - state: absent + ipaadmin_password: SomeADMINpassword + name: my_location1 + state: absent register: result failed_when: result.changed or result.failed @@ -60,5 +67,6 @@ - name: Ensure location my_location1 is absent ipalocation: - name: my_location1 - state: absent + ipaadmin_password: SomeADMINpassword + name: my_location1 + state: absent