From 674e895d0a56b2e49f3076d3c479ceb5c984436f Mon Sep 17 00:00:00 2001 From: Luke Sneeringer Date: Mon, 4 Aug 2014 10:13:40 -0500 Subject: [PATCH] Shift default Azure cache directory from /tmp to ~ --- awx/plugins/inventory/windows_azure.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/awx/plugins/inventory/windows_azure.py b/awx/plugins/inventory/windows_azure.py index 8be899d939..7aab89718e 100755 --- a/awx/plugins/inventory/windows_azure.py +++ b/awx/plugins/inventory/windows_azure.py @@ -72,8 +72,10 @@ class AzureInventory(object): self.parse_cli_args() # Cache setting defaults. - self.cache_path_cache = '/tmp/ansible-azure.cache' - self.cache_path_index = '/tmp/ansible-azure.index' + # These can be overridden in settings (see `read_settings`). + cache_dir = os.path.expanduser('~') + self.cache_path_cache = '%s/.ansible-azure.cache' % cache_dir + self.cache_path_index = '%s/.ansible-azure.index' % cache_dir self.cache_max_age = 0 # Initialize Azure ServiceManagementService @@ -159,8 +161,8 @@ class AzureInventory(object): # Cache related if config.has_option('azure', 'cache_path'): cache_path = config.get('azure', 'cache_path') - self.cache_path_cache = cache_path + "/ansible-azure.cache" - self.cache_path_index = cache_path + "/ansible-azure.index" + self.cache_path_cache = cache_path + '/ansible-azure.cache' + self.cache_path_index = cache_path + '/ansible-azure.index' if config.has_option('azure', 'cache_max_age'): self.cache_max_age = config.getint('azure', 'cache_max_age')