From b7d644d484c11f6af4134af021b9d05037a48193 Mon Sep 17 00:00:00 2001 From: Aleksey Zhukov Date: Thu, 14 May 2015 09:42:48 +0300 Subject: [PATCH] Fix broken cache logic --- plugins/inventory/digital_ocean.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/plugins/inventory/digital_ocean.py b/plugins/inventory/digital_ocean.py index 9bfb184d578..1323a384ba9 100755 --- a/plugins/inventory/digital_ocean.py +++ b/plugins/inventory/digital_ocean.py @@ -226,6 +226,9 @@ or environment variables (DO_API_TOKEN)''' self.build_inventory() json_data = self.inventory + if self.cache_refreshed: + self.write_to_cache() + if self.args.pretty: print json.dumps(json_data, sort_keys=True, indent=2) else: @@ -309,23 +312,30 @@ or environment variables (DO_API_TOKEN)''' '''Get JSON from DigitalOcean API''' if self.args.force_cache: return + # We always get fresh droplets + if self.is_cache_valid() and not (resource=='droplets' or resource is None): + return if self.args.refresh_cache: resource=None if resource == 'droplets' or resource is None: self.data['droplets'] = self.manager.all_active_droplets() + self.cache_refreshed = True if resource == 'regions' or resource is None: self.data['regions'] = self.manager.all_regions() + self.cache_refreshed = True if resource == 'images' or resource is None: self.data['images'] = self.manager.all_images(filter=None) + self.cache_refreshed = True if resource == 'sizes' or resource is None: self.data['sizes'] = self.manager.sizes() + self.cache_refreshed = True if resource == 'ssh_keys' or resource is None: self.data['ssh_keys'] = self.manager.all_ssh_keys() + self.cache_refreshed = True if resource == 'domains' or resource is None: self.data['domains'] = self.manager.all_domains() - - self.write_to_cache() + self.cache_refreshed = True def build_inventory(self):