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

Update inventory caching to remove deprecation warnings (#53976)

Browse source
This commit is contained in:
Sloane Hertel 2019-03-26 08:15:12 -05:00 committed by GitHub
parent 1a5732807f
commit a93154c57f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/plugins/inventory/aws_ec2.py
View file

@ -583,7 +583,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
cache_needs_update = False
if cache:
try:
results = self.cache.get(cache_key)
results = self._cache[cache_key]
except KeyError:
# if cache expires or cache file doesn't exist
cache_needs_update = True
@ -596,7 +596,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
# If the cache has expired/doesn't exist or if refresh_inventory/flush cache is used
# when the user is using caching, update the cached inventory
if cache_needs_update or (not cache and self.get_option('cache')):
self.cache.set(cache_key, results)
self._cache[cache_key] = results
@staticmethod
def _legacy_script_compatible_group_sanitization(name):

4
lib/ansible/plugins/inventory/aws_rds.py
View file

@ -308,7 +308,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
cache_needs_update = False
if cache:
try:
results = self.cache.get(cache_key)
results = self._cache[cache_key]
except KeyError:
# if cache expires or cache file doesn't exist
cache_needs_update = True
@ -323,4 +323,4 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
# If the cache has expired/doesn't exist or if refresh_inventory/flush cache is used
# when the user is using caching, update the cached inventory
if cache_needs_update or (not cache and self.get_option('cache')):
self.cache.set(cache_key, formatted_inventory)
self._cache[cache_key] = formatted_inventory

4
lib/ansible/plugins/inventory/gcp_compute.py
View file

@ -370,7 +370,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
cache_needs_update = False
if cache:
try:
results = self.cache.get(cache_key)
results = self._cache[cache_key]
for project in results:
for zone in results[project]:
self._add_hosts(results[project][zone], config_data, False)
@ -392,7 +392,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
cached_data[project][zone] = resp.get('items')
if cache_needs_update:
self.cache.set(cache_key, cached_data)
self._cache[cache_key] = cached_data
@staticmethod
def _legacy_script_compatible_group_sanitization(name):

13
lib/ansible/plugins/inventory/openstack.py
View file

@ -156,14 +156,19 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
if 'clouds' in self._config_data:
self._config_data = {}
# update cache if the user has caching enabled and the cache is being refreshed
# will update variable below in the case of an expired cache
cache_needs_update = not cache and self.get_option('cache')
if cache:
cache = self.get_option('cache')
source_data = None
if cache:
try:
source_data = self.cache.get(cache_key)
source_data = self._cache[cache_key]
except KeyError:
pass
# cache expired or doesn't exist yet
cache_needs_update = True
if not source_data:
clouds_yaml_path = self._config_data.get('clouds_yaml_path')
@ -199,8 +204,8 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
source_data = cloud_inventory.list_hosts(
expand=expand_hostvars, fail_on_cloud_config=fail_on_errors)
if self.cache is not None:
self.cache.set(cache_key, source_data)
if cache_needs_update:
self._cache[cache_key] = source_data
self._populate_from_source(source_data)

4
lib/ansible/plugins/inventory/virtualbox.py
View file

@ -244,7 +244,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
update_cache = False
if cache:
try:
source_data = self.cache.get(cache_key)
source_data = self._cache[cache_key]
except KeyError:
update_cache = True
@ -274,4 +274,4 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
cacheable_results = self._populate_from_source(source_data, using_current_cache)
if update_cache:
self.cache.set(cache_key, cacheable_results)
self._cache[cache_key] = cacheable_results

4
lib/ansible/plugins/inventory/vmware_vm_inventory.py
View file

@ -356,7 +356,7 @@ class InventoryModule(BaseInventoryPlugin, Cacheable):
update_cache = False
if cache:
try:
source_data = self.cache.get(cache_key)
source_data = self._cache[cache_key]
except KeyError:
update_cache = True
@ -364,7 +364,7 @@ class InventoryModule(BaseInventoryPlugin, Cacheable):
cacheable_results = self._populate_from_source(source_data, using_current_cache)
if update_cache:
self.cache.set(cache_key, cacheable_results)
self._cache[cache_key] = cacheable_results
def _populate_from_cache(self, source_data):
""" Populate cache using source data """