ansible
/
Ansible-Proxmox-inventory
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved handling of partially missing parameters

This commit is contained in:
Niccolò Maggioni 2017-03-17 11:50:31 +01:00
parent b23d4751e1
commit 93d8723b98
No known key found for this signature in database
GPG Key ID: 4874B0C841E33264
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
proxmox.py
View File

@ -94,21 +94,25 @@ class ProxmoxAPI(object):
os.path.dirname(os.path.abspath(__file__)),
os.path.splitext(os.path.basename(__file__))[0]+".json"
)
if not options.url or not options.username or not options.password:
if os.path.isfile(config_path):
with open(config_path, "r") as config_file:
config_data = json.load(config_file)
try:
options.url = config_data["url"]
except KeyError:
options.url = None
try:
options.username = config_data["username"]
except KeyError:
options.username = None
try:
options.password = config_data["password"]
except KeyError:
options.password = None
if not options.url:
try:
options.url = config_data["url"]
except KeyError:
options.url = None
if not options.username:
try:
options.username = config_data["username"]
except KeyError:
options.username = None
if not options.password:
try:
options.password = config_data["password"]
except KeyError:
options.password = None
if not options.url:
raise Exception('Missing mandatory parameter --url (or PROXMOX_URL or "url" key in config file).')