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

account for absense of config file

Browse source
This commit is contained in:
Brian Coca 2017-06-14 11:38:35 -04:00
parent dfcf43efa9
commit 6b99f0d65c
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/ansible/config/manager.py
View file

@ -89,17 +89,18 @@ class ConfigManager(object):
# TODO: take list of files with merge/nomerge # TODO: take list of files with merge/nomerge
parser = None parser = None
if ftype == 'ini': if cfile:
parser = configparser.ConfigParser() if ftype == 'ini':
try: parser = configparser.ConfigParser()
parser.read(cfile) try:
except configparser.Error as e: parser.read(cfile)
raise AnsibleOptionsError("Error reading config file: \n{0}".format(e)) except configparser.Error as e:
elif ftype == 'yaml': raise AnsibleOptionsError("Error reading config file: \n{0}".format(e))
with open(cfile, 'rb') as config_stream: elif ftype == 'yaml':
parser = yaml.safe_load(config_stream) with open(cfile, 'rb') as config_stream:
else: parser = yaml.safe_load(config_stream)
raise AnsibleOptionsError("Unsupported configuration file type: \n{0}".format(ftype)) else:
raise AnsibleOptionsError("Unsupported configuration file type: \n{0}".format(ftype))
self.update_config(cfile, self.initial_defs, parser, ftype) self.update_config(cfile, self.initial_defs, parser, ftype)