cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix netbox url with urljoin (#47655)

Browse source
This commit is contained in:
Rémy Léone 2018-10-29 14:17:06 +01:00 committed by John R Barker
parent 893c0dbba7
commit 7837497b0b
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/plugins/inventory/netbox.py
View file

@ -355,11 +355,10 @@ class InventoryModule(BaseInventoryPlugin, Constructable):
if self.query_filters:
query_parameters.extend(filter(lambda x: x,
map(self.validate_query_parameters, self.query_filters)))
self.device_url = self.api_endpoint + "/api/dcim/devices/" + "?" + urlencode(query_parameters)
self.virtual_machines_url = "".join([self.api_endpoint,
"/api/virtualization/virtual-machines/",
"?",
urlencode(query_parameters)])
self.device_url = urljoin(self.api_endpoint,
"/api/dcim/devices/?" + urlencode(query_parameters))
self.virtual_machines_url = urljoin(self.api_endpoint,
"/api/virtualization/virtual-machines/?" + urlencode(query_parameters))
def fetch_hosts(self):
return chain(