openstack
/
tripleo-validations
Code Issues Proposed changes

Merge "Improve exceptions in tripleo-ansible-inventory"

This commit is contained in:
Zuul 2018-03-07 16:21:46 +00:00 committed by Gerrit Code Review
parent 778b477c98 5d30a5aa8e
commit 1edb2385ab
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/tripleo-ansible-inventory
View File

@ -24,6 +24,7 @@ from __future__ import print_function
import os
import sys
import json
import traceback
from heatclient import client as heat_client
from oslo_config import cfg
@ -60,6 +61,7 @@ opts = [
'will take precedence.')),
cfg.StrOpt('ansible_ssh_user', default=os.environ.get('ANSIBLE_SSH_USER',
'heat-admin')),
cfg.BoolOpt('debug', help='Print tracebacks for exceptions')
]
@ -141,8 +143,10 @@ def main():
inventory_list = inventory.list()
print(json.dumps(inventory_list))
except Exception as e:
print("Error creating inventory: {}".format(e.message),
print("Error creating inventory: {}".format(e),
file=sys.stderr)
if configs.debug:
traceback.print_exc()
sys.exit(1)
elif configs.static_yaml_inventory or configs.static_inventory:
if configs.static_inventory:
@ -154,8 +158,10 @@ def main():
try:
inventory.write_static_inventory(configs.static_yaml_inventory)
except Exception as e:
print("Error creating static inventory: {}".format(e.message),
print("Error creating static inventory: {}".format(e),
file=sys.stderr)
if configs.debug:
traceback.print_exc()
sys.exit(1)
elif configs.host:
print(json.dumps(inventory.host()))