External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Set azure inventory cache defaults before reading settings.

Browse Source
This commit is contained in:
Chris Church
2015-06-30 16:41:22 -04:00
parent e217ab00c0
commit 5b16934459
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/plugins/inventory/windows_azure.py
View File

@@ -67,11 +67,6 @@ class AzureInventory(object):
self.index = {} self.index = {}
self.host_metadata = {} self.host_metadata = {}
# Read settings and parse CLI arguments
self.read_settings()
self.read_environment()
self.parse_cli_args()
# Cache setting defaults. # Cache setting defaults.
# These can be overridden in settings (see `read_settings`). # These can be overridden in settings (see `read_settings`).
cache_dir = os.path.expanduser('~') cache_dir = os.path.expanduser('~')
@@ -79,6 +74,11 @@ class AzureInventory(object):
self.cache_path_index = '%s/.ansible-azure.index' % cache_dir self.cache_path_index = '%s/.ansible-azure.index' % cache_dir
self.cache_max_age = 0 self.cache_max_age = 0
# Read settings and parse CLI arguments
self.read_settings()
self.read_environment()
self.parse_cli_args()
# Initialize Azure ServiceManagementService # Initialize Azure ServiceManagementService
self.sms = ServiceManagementService(self.subscription_id, self.cert_path) self.sms = ServiceManagementService(self.subscription_id, self.cert_path)