External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-09 13:39:27 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge foreman inventory script performance fixes.

Browse Source 
Sent & accepted upstream.
This commit is contained in:
Bill Nottingham
2017-01-24 16:40:59 -05:00
parent f0e61671a6
commit e12ae193db
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
awx/plugins/inventory/foreman.py
View File

@@ -53,6 +53,7 @@ class ForemanInventory(object):
self.params = dict() # Params of each host self.params = dict() # Params of each host
self.facts = dict() # Facts of each host self.facts = dict() # Facts of each host
self.hostgroups = dict() # host groups self.hostgroups = dict() # host groups
self.session = None # Requests session
def run(self): def run(self):
if not self._read_settings(): if not self._read_settings():
@@ -173,14 +174,19 @@ class ForemanInventory(object):
help='Force refresh of cache by making API requests to foreman (default: False - use cache files)') help='Force refresh of cache by making API requests to foreman (default: False - use cache files)')
self.args = parser.parse_args() self.args = parser.parse_args()
def _get_session(self):
if not self.session:
self.session = requests.session()
self.session.auth = HTTPBasicAuth(self.foreman_user, self.foreman_pw)
self.session.verify = self.foreman_ssl_verify
return self.session
def _get_json(self, url, ignore_errors=None): def _get_json(self, url, ignore_errors=None):
page = 1 page = 1
results = [] results = []
s = self._get_session()
while True: while True:
ret = requests.get(url, ret = s.get(url, params={'page': page, 'per_page': 250})
auth=HTTPBasicAuth(self.foreman_user, self.foreman_pw),
verify=self.foreman_ssl_verify,
params={'page': page, 'per_page': 250})
if ignore_errors and ret.status_code in ignore_errors: if ignore_errors and ret.status_code in ignore_errors:
break break
ret.raise_for_status() ret.raise_for_status()
@@ -299,7 +305,7 @@ class ForemanInventory(object):
self.params[dns_name] = params self.params[dns_name] = params
self.facts[dns_name] = self._get_facts(host) self.facts[dns_name] = self._get_facts(host)
self.push(self.inventory, 'all', dns_name) self.push(self.inventory, 'all', dns_name)
self._write_cache() self._write_cache()
def _write_cache(self): def _write_cache(self):
self.write_to_cache(self.cache, self.cache_path_cache) self.write_to_cache(self.cache, self.cache_path_cache)