Skip to content

Commit 4b606fd

Browse files
authored
Fix #860: Make sure ansible < 2.11 works with inventory (#861)
1 parent fa60f46 commit 4b606fd

File tree

1 file changed

+20
-9
lines changed

1 file changed

+20
-9
lines changed

plugins/inventory/nb_inventory.py

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1950,10 +1950,16 @@ def parse(self, inventory, loader, path, cache=True):
19501950
super(InventoryModule, self).parse(inventory, loader, path)
19511951
self._read_config_data(path=path)
19521952
self.use_cache = cache
1953-
self.templar.available_variables = self._vars
19541953

19551954
# NetBox access
1956-
token = self.templar.template(self.get_option("token"), fail_on_undefined=False)
1955+
if version.parse(ansible_version) < version.parse("2.11"):
1956+
token = self.get_option("token")
1957+
else:
1958+
self.templar.available_variables = self._vars
1959+
token = self.templar.template(
1960+
self.get_option("token"), fail_on_undefined=False
1961+
)
1962+
19571963
# Handle extra "/" from api_endpoint configuration and trim if necessary, see PR#49943
19581964
self.api_endpoint = self.get_option("api_endpoint").strip("/")
19591965
self.timeout = self.get_option("timeout")
@@ -1984,13 +1990,18 @@ def parse(self, inventory, loader, path, cache=True):
19841990
# Filter and group_by options
19851991
self.group_by = self.get_option("group_by")
19861992
self.group_names_raw = self.get_option("group_names_raw")
1987-
self.query_filters = self.templar.template(self.get_option("query_filters"))
1988-
self.device_query_filters = self.templar.template(
1989-
self.get_option("device_query_filters")
1990-
)
1991-
self.vm_query_filters = self.templar.template(
1992-
self.get_option("vm_query_filters")
1993-
)
1993+
if version.parse(ansible_version) < version.parse("2.11"):
1994+
self.query_filters = self.get_option("query_filters")
1995+
self.device_query_filters = self.get_option("device_query_filters")
1996+
self.vm_query_filters = self.get_option("vm_query_filters")
1997+
else:
1998+
self.query_filters = self.templar.template(self.get_option("query_filters"))
1999+
self.device_query_filters = self.templar.template(
2000+
self.get_option("device_query_filters")
2001+
)
2002+
self.vm_query_filters = self.templar.template(
2003+
self.get_option("vm_query_filters")
2004+
)
19942005
self.virtual_chassis_name = self.get_option("virtual_chassis_name")
19952006
self.dns_name = self.get_option("dns_name")
19962007
self.ansible_host_dns_name = self.get_option("ansible_host_dns_name")

0 commit comments

Comments
 (0)