Skip to content

Fix #860: Make sure inventory works with ansible < 2.11 #861

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

Merged
merged 1 commit into from
Nov 6, 2022
Merged

Fix #860: Make sure inventory works with ansible < 2.11 #861

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 20 additions & 9 deletions plugins/inventory/nb_inventory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1950,10 +1950,16 @@ def parse(self, inventory, loader, path, cache=True):
super(InventoryModule, self).parse(inventory, loader, path)
self._read_config_data(path=path)
self.use_cache = cache
self.templar.available_variables = self._vars

# NetBox access
token = self.templar.template(self.get_option("token"), fail_on_undefined=False)
if version.parse(ansible_version) < version.parse("2.11"):
token = self.get_option("token")
else:
self.templar.available_variables = self._vars
token = self.templar.template(
self.get_option("token"), fail_on_undefined=False
)

# Handle extra "/" from api_endpoint configuration and trim if necessary, see PR#49943
self.api_endpoint = self.get_option("api_endpoint").strip("/")
self.timeout = self.get_option("timeout")
Expand Down Expand Up @@ -1984,13 +1990,18 @@ def parse(self, inventory, loader, path, cache=True):
# Filter and group_by options
self.group_by = self.get_option("group_by")
self.group_names_raw = self.get_option("group_names_raw")
self.query_filters = self.templar.template(self.get_option("query_filters"))
self.device_query_filters = self.templar.template(
self.get_option("device_query_filters")
)
self.vm_query_filters = self.templar.template(
self.get_option("vm_query_filters")
)
if version.parse(ansible_version) < version.parse("2.11"):
self.query_filters = self.get_option("query_filters")
self.device_query_filters = self.get_option("device_query_filters")
self.vm_query_filters = self.get_option("vm_query_filters")
else:
self.query_filters = self.templar.template(self.get_option("query_filters"))
self.device_query_filters = self.templar.template(
self.get_option("device_query_filters")
)
self.vm_query_filters = self.templar.template(
self.get_option("vm_query_filters")
)
self.virtual_chassis_name = self.get_option("virtual_chassis_name")
self.dns_name = self.get_option("dns_name")
self.ansible_host_dns_name = self.get_option("ansible_host_dns_name")
Expand Down