Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/plugins/address_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ Parameters

<div class="ansible-option-cell">

IP address to hanle
IP address to handle


.. raw:: html
Expand Down
2 changes: 1 addition & 1 deletion plugins/module_utils/phpipam_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def __init__(self, **kwargs):
self.phpipam_spec, gen_args = self._phpipam_spec_helper(kwargs.pop('phpipam_spec', {}))
argument_spec = dict(
server_url=dict(required=True, fallback=(env_fallback, ['PHPIPAM_SERVER_URL'])),
app_id=dict(required=True, fallback=(env_fallback, ['PHPIPAM_APP_ID'])),
app_id=dict(required=False, fallback=(env_fallback, ['PHPIPAM_APP_ID']), default='ansible'),
username=dict(required=True, fallback=(env_fallback, ['PHPIPAM_USERNAME'])),
password=dict(required=True, fallback=(env_fallback, ['PHPIPAM_PASSWORD']), no_log=True),
validate_certs=dict(type='bool', fallback=(env_fallback, ['PHPIPAM_VALIDATE_CERTS']), required=False, default=True),
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/section.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def main():
phpipam_spec=dict(
name=dict(type='str', required=True),
description=dict(type='str', required=False),
parent=dict(type='entity', controller='sections', required=False, defautl=None, phpipam_name='masterSection'),
parent=dict(type='entity', controller='sections', required=False, default=None, phpipam_name='masterSection'),
permissions=dict(type='json', required=False, default=None),
strict_mode=dict(type='bool', required=False),
subnet_ordering=dict(type='bool', required=False, phpipam_name='subnetOrdering'),
Expand Down
19 changes: 19 additions & 0 deletions tests/test_playbooks/shared_vars.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- name: Check app_id defaults to 'ansible'
hosts: localhost
gather_facts: false
vars_files:
- vars/server.yml
- vars/section.yml
tasks:
- name: Create section
ansible.builtin.include_tasks: tasks/shared_vars_section.yml
vars:
step: create section
section: '{{ base_section_data }}'
- name: Delete section
ansible.builtin.include_tasks: tasks/shared_vars_section.yml
vars:
step: delete section
override:
state: absent
section: '{{ base_section_data | combine(override) }}'
19 changes: 19 additions & 0 deletions tests/test_playbooks/tasks/shared_vars_section.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
- name: "Ensure state of section: {{ step }}"
codeaffen.phpipam.section:
server_url: "{{ phpipam_server_url }}"
username: "{{ phpipam_username }}"
password: "{{ phpipam_password }}"
name: "{{ section.name }}"
description: "{{ section.description | default(omit) }}"
parent: "{{ section.parent | default(omit) }}"
permissions: "{{ section.permissions | default(omit) }}"
strict_mode: "{{ section.strict_mode | default(omit) }}"
subnet_ordering: "{{ section.subnet_ordering | default(omit) }}"
list_order: "{{ section.list_order | default(omit) }}"
show_vlan: "{{ section.show_vlan | default(omit) }}"
show_vrf: "{{ section.show_vrf | default(omit) }}"
show_supernets_only: "{{ section.show_supernets_only | default(omit) }}"
dns_resolver: "{{ section.dns_resolver | default(omit) }}"
validate_certs: "{{ section.validate_certs | default('no') }}"
state: "{{ section.state | default('present') }}"
Loading