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

take into account if cache file exists when loading data from digitalocean even with --force-cache

Browse source
This commit is contained in:
Jorge Quintás 2015-10-07 14:42:37 +02:00 committed by Brian Coca
parent 38eeeb755d
commit d3c94e82a5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/inventory/digital_ocean.py
View file

@ -192,7 +192,7 @@ or environment variables (DO_API_TOKEN)\n''')
self.cache_filename = self.cache_path + "/ansible-digital_ocean.cache" self.cache_filename = self.cache_path + "/ansible-digital_ocean.cache"
self.cache_refreshed = False self.cache_refreshed = False
if self.is_cache_valid: if self.is_cache_valid():
self.load_from_cache() self.load_from_cache()
if len(self.data) == 0: if len(self.data) == 0:
if self.args.force_cache: if self.args.force_cache:
@ -318,7 +318,7 @@ or environment variables (DO_API_TOKEN)\n''')
def load_from_digital_ocean(self, resource=None): def load_from_digital_ocean(self, resource=None):
'''Get JSON from DigitalOcean API''' '''Get JSON from DigitalOcean API'''
if self.args.force_cache: if self.args.force_cache and os.path.isfile(self.cache_filename):
return return
# We always get fresh droplets # We always get fresh droplets
if self.is_cache_valid() and not (resource == 'droplets' or resource is None): if self.is_cache_valid() and not (resource == 'droplets' or resource is None):