openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Use predictable name for generated hiera overrides"

This commit is contained in:
Zuul 2018-05-15 14:49:27 +00:00 committed by Gerrit Code Review
parent 8ebb44071f 84ad50289d
commit f1721e24ec
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tripleoclient/v1/tripleo_deploy.py
View File

@ -689,19 +689,17 @@ class Deploy(command.Command):
# {parameter_defaults: {UndercloudExtraConfig: ... }} # {parameter_defaults: {UndercloudExtraConfig: ... }}
if ('UndercloudExtraConfig' not in hiera_data.get('parameter_defaults', if ('UndercloudExtraConfig' not in hiera_data.get('parameter_defaults',
{})): {})):
with tempfile.NamedTemporaryFile(dir=self.tht_render, hiera_override_file = os.path.join(
prefix='hieradata-override', self.tht_render, 'tripleo-hieradata-override.yaml')
suffix='.yaml', self.log.info('Converting hiera overrides for t-h-t from '
delete=False) as override: 'legacy format into a file %s' %
self.log.info('Converting hiera overrides for t-h-t from ' hiera_override_file)
'legacy format into a tempfile %s' % yaml.safe_dump(
override.name) {'parameter_defaults': {
yaml.safe_dump( 'UndercloudExtraConfig': hiera_data}},
{'parameter_defaults': { hiera_override_file,
'UndercloudExtraConfig': hiera_data}}, default_flow_style=False)
override, target = hiera_override_file
default_flow_style=False)
target = override.name
return target return target
def _standalone_deploy(self, parsed_args): def _standalone_deploy(self, parsed_args):