openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Improve error message around hieradata override file"

Browse Source
This commit is contained in:
Zuul 2019-01-11 00:16:29 +00:00 committed by Gerrit Code Review
commit e484c48764
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tripleoclient/v1/tripleo_deploy.py
View File

@ -1071,6 +1071,12 @@ class Deploy(command.Command):
target = override_file target = override_file
data = open(target, 'r').read() data = open(target, 'r').read()
if not data.strip():
# since an empty file isn't valid yaml, let's be more specific
msg = (_("hieradata override file (%s) cannot be empty") % target)
self.log.error(msg)
raise exceptions.DeploymentError(msg)
hiera_data = yaml.safe_load(data) hiera_data = yaml.safe_load(data)
if not hiera_data: if not hiera_data:
msg = (_('Unsupported data format in hieradata override %s') % msg = (_('Unsupported data format in hieradata override %s') %