Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: issue with wrong variable name #70

Merged
merged 2 commits into from
Feb 14, 2025
Merged

fix: issue with wrong variable name #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11801c4
fix: issue with wrong variable name
przemkalit Feb 11, 2025
8d5940e
fix: missing changelog
przemkalit Feb 11, 2025
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
4 changes: 4 additions & 0 deletions changelogs/fragments/filetree_create_inventory_template_variable_typo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
bugfixes:
- filetree_create use proper global template variable name
...
14 changes: 7 additions & 7 deletions roles/filetree_create/templates/controller_inventories.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ controller_inventories:
| default(current_inventories_asset_value.description) | regex_replace("'", "''") }}'
organization: "{{ inventory_organization }}"
{% if template_overrides_resources.inventory[current_inventories_asset_value.name].host_filter is defined
or template_overrides_global_global.inventory.host_filter is defined
or template_overrides_global.inventory.host_filter is defined
or (current_inventories_asset_value.host_filter is defined and current_inventories_asset_value.host_filter | type_debug != 'NoneType') %}
host_filter: '{{ template_overrides_resources.inventory[current_inventories_asset_value.name].host_filter
| default(template_overrides_global.inventory.host_filter)
Expand All @@ -18,14 +18,14 @@ controller_inventories:
kind: "{{ current_inventories_asset_value.kind }}"
{% endif %}
{% if template_overrides_resources.inventory[current_inventories_asset_value.name].prevent_instance_group_fallback is defined
or template_overrides_global_global.inventory.prevent_instance_group_fallback is defined
or template_overrides_global.inventory.prevent_instance_group_fallback is defined
or current_inventories_asset_value.prevent_instance_group_fallback is defined %}
prevent_instance_group_fallback: {{ template_overrides_resources.inventory[current_inventories_asset_value.name].prevent_instance_group_fallback
| default(template_overrides_global.inventory.prevent_instance_group_fallback)
| default(current_inventories_asset_value.prevent_instance_group_fallback) }}
{% endif %}
{% if template_overrides_resources.inventory[current_inventories_asset_value.name].source_vars is defined
or template_overrides_global_global.inventory.source_vars is defined
or template_overrides_global.inventory.source_vars is defined
or current_inventories_asset_value.source_vars is defined %}
source_vars:
{{ template_overrides_resources.inventory[current_inventories_asset_value.name].source_vars
Expand All @@ -34,28 +34,28 @@ controller_inventories:
| from_yaml | to_nice_yaml(indent=2, sort_keys=False) | indent(width=6, first=False) | regex_replace('(^[^:]*): (.*){([{%])', '\\g<1>: !unsafe \\g<2>{\\g<3>', multiline=True)}}
{% endif %}
{% if template_overrides_resources.inventory[current_inventories_asset_value.name].update_cache_timeout is defined
or template_overrides_global_global.inventory.update_cache_timeout is defined
or template_overrides_global.inventory.update_cache_timeout is defined
or current_inventories_asset_value.update_cache_timeout is defined %}
update_cache_timeout: {{ template_overrides_resources.inventory[current_inventories_asset_value.name].update_cache_timeout
| default(template_overrides_global.inventory.update_cache_timeout)
| default(current_inventories_asset_value.update_cache_timeout) }}
{% endif %}
{% if template_overrides_resources.inventory[current_inventories_asset_value.name].limit is defined
or template_overrides_global_global.inventory.limit is defined
or template_overrides_global.inventory.limit is defined
or current_inventories_asset_value.limit is defined %}
limit: "{{ template_overrides_resources.inventory[current_inventories_asset_value.name].limit
| default(template_overrides_global.inventory.limit)
| default(current_inventories_asset_value.limit) }}"
{% endif %}
{% if template_overrides_resources.inventory[current_inventories_asset_value.name].verbosity is defined
or template_overrides_global_global.inventory.verbosity is defined
or template_overrides_global.inventory.verbosity is defined
or current_inventories_asset_value.verbosity is defined %}
verbosity: {{ template_overrides_resources.inventory[current_inventories_asset_value.name].verbosity
| default(template_overrides_global.inventory.verbosity)
| default(current_inventories_asset_value.verbosity) }}
{% endif %}
{% if template_overrides_resources.inventory[current_inventories_asset_value.name].variables is defined
or template_overrides_global_global.inventory.variables is defined
or template_overrides_global.inventory.variables is defined
or (current_inventories_asset_value.variables is defined and current_inventories_asset_value.variables != '---' and current_inventories_asset_value.variables != '') %}
variables:
{{ template_overrides_resources.inventory[current_inventories_asset_value.name].variables
Expand Down