mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-22 12:50:22 -07:00
* Update filter lists_mergeby #4057
* Added options 'recursive' and 'list_merge'. The functionality of the
added options is the same as in the filter 'combine'.
* Allow the user to do [list1, list2, ...]|lists_mergeby('index')
* Use the function merge_hash from ansible.utils.vars
* Add merge_hash_wrapper to test Ansible version
* Enable Ansible 2.9 and lower versions with default options of
lists_mergeby only.
* Non-default options of lists_mergeby trigger error in 2.9 and lower
versions.
* Update messages and tests.
* Fix tests.
* Use LooseVersion instead of SpecifierSet.
* Update docs 'Filter Guide' section 'Merging lists of dictionaries'.
* Added changelog fragment.
* Update changelogs/fragments/4058-lists_mergeby-add-parameters.yml
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/filter_guide.rst
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/filter_guide.rst
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/filter_guide.rst
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/filter_guide.rst
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/filter_guide.rst
Co-authored-by: Felix Fontein <felix@fontein.de>
* Added examples; moved to rst/examples; fixes.
* Improve error message testing sequence.
* Removed .yamllint
* Update docs/docsite/rst/examples/lists_mergeby/example-003.yml
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/examples/lists_mergeby/example-004.yml
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/examples/lists_mergeby/example-005.yml
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/examples/lists_mergeby/example-006.yml
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/examples/lists_mergeby/example-007.yml
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/filter_guide.rst
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/filter_guide.rst
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/filter_guide.rst
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update tests/integration/targets/filter_list/tasks/lists_mergeby_default.yml
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/examples/lists_mergeby/example-008.yml
Co-authored-by: Felix Fontein <felix@fontein.de>
* Fix docs. Antsibull only copies .rst files.
* Fix examples in-line.
* Update docs/docsite/rst/filter_guide.rst
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/examples/lists_mergeby/examples.yml
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/examples/lists_mergeby/examples.yml
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/examples/lists_mergeby/examples.yml
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/examples/lists_mergeby/examples.yml
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/examples/lists_mergeby/examples.yml
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs/docsite/rst/examples/lists_mergeby/examples.yml
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update docs lists_mergeby. Remove rubbish.
* Emphasized labes of examples in filter_guide.rst
* Removed temporary file examples/lists_mergeby/examples.rst
* Removed tests/integration/targets/filter_list/runme.*
* Fix docs. Description of the lists_merge options.
* Move helper files out of rst/ directory.
Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 71fb3984db
)
Co-authored-by: Vladimir Botka <vbotka@gmail.com>
This commit is contained in:
parent
9c4799c903
commit
49eda7270e
27 changed files with 1426 additions and 123 deletions
8
docs/docsite/helper/lists_mergeby/examples.rst.j2
Normal file
8
docs/docsite/helper/lists_mergeby/examples.rst.j2
Normal file
|
@ -0,0 +1,8 @@
|
|||
{% for i in examples %}
|
||||
{{ i.label }}
|
||||
|
||||
.. code-block:: {{ i.lang }}
|
||||
|
||||
{{ lookup('file', source_path ~ i.file)|indent(2) }}
|
||||
|
||||
{% endfor %}
|
38
docs/docsite/helper/lists_mergeby/examples.yml
Normal file
38
docs/docsite/helper/lists_mergeby/examples.yml
Normal file
|
@ -0,0 +1,38 @@
|
|||
---
|
||||
examples:
|
||||
- label: 'Example ``list_merge=replace`` (default):'
|
||||
file: example-003.yml
|
||||
lang: 'yaml+jinja'
|
||||
- label: 'This produces:'
|
||||
file: example-003.out
|
||||
lang: 'yaml'
|
||||
- label: 'Example ``list_merge=keep``:'
|
||||
file: example-004.yml
|
||||
lang: 'yaml+jinja'
|
||||
- label: 'This produces:'
|
||||
file: example-004.out
|
||||
lang: 'yaml'
|
||||
- label: 'Example ``list_merge=append``:'
|
||||
file: example-005.yml
|
||||
lang: 'yaml+jinja'
|
||||
- label: 'This produces:'
|
||||
file: example-005.out
|
||||
lang: 'yaml'
|
||||
- label: 'Example ``list_merge=prepend``:'
|
||||
file: example-006.yml
|
||||
lang: 'yaml+jinja'
|
||||
- label: 'This produces:'
|
||||
file: example-006.out
|
||||
lang: 'yaml'
|
||||
- label: 'Example ``list_merge=append_rp``:'
|
||||
file: example-007.yml
|
||||
lang: 'yaml+jinja'
|
||||
- label: 'This produces:'
|
||||
file: example-007.out
|
||||
lang: 'yaml'
|
||||
- label: 'Example ``list_merge=prepend_rp``:'
|
||||
file: example-008.yml
|
||||
lang: 'yaml+jinja'
|
||||
- label: 'This produces:'
|
||||
file: example-008.out
|
||||
lang: 'yaml'
|
41
docs/docsite/helper/lists_mergeby/playbook.yml
Normal file
41
docs/docsite/helper/lists_mergeby/playbook.yml
Normal file
|
@ -0,0 +1,41 @@
|
|||
---
|
||||
# The following runs all examples:
|
||||
#
|
||||
# ANSIBLE_STDOUT_CALLBACK=community.general.yaml ansible-playbook playbook.yml -e examples=true
|
||||
#
|
||||
# You need to copy the YAML output of example-XXX.yml into example-XXX.out.
|
||||
#
|
||||
# The following generates examples.rst out of the .out files:
|
||||
#
|
||||
# ansible-playbook playbook.yml -e template=true
|
||||
- hosts: localhost
|
||||
gather_facts: false
|
||||
vars:
|
||||
source_path: ../../rst/examples/lists_mergeby/
|
||||
tasks:
|
||||
|
||||
- block:
|
||||
- import_tasks: '{{ source_path }}example-001.yml'
|
||||
tags: t001
|
||||
- import_tasks: '{{ source_path }}example-002.yml'
|
||||
tags: t002
|
||||
- import_tasks: '{{ source_path }}example-003.yml'
|
||||
tags: t003
|
||||
- import_tasks: '{{ source_path }}example-004.yml'
|
||||
tags: t004
|
||||
- import_tasks: '{{ source_path }}example-005.yml'
|
||||
tags: t005
|
||||
- import_tasks: '{{ source_path }}example-006.yml'
|
||||
tags: t006
|
||||
- import_tasks: '{{ source_path }}example-007.yml'
|
||||
tags: t007
|
||||
- import_tasks: '{{ source_path }}example-008.yml'
|
||||
tags: t008
|
||||
when: examples|d(false)|bool
|
||||
|
||||
- block:
|
||||
- include_vars: examples.yml
|
||||
- template:
|
||||
src: examples.rst.j2
|
||||
dest: examples.rst
|
||||
when: template|d(false)|bool
|
Loading…
Add table
Add a link
Reference in a new issue