From 84ad50289de396bc45f413b688bec404633eafdd Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobreli@redhat.com>
Date: Fri, 4 May 2018 16:38:40 +0200
Subject: [PATCH] Use predictable name for generated hiera overrides

Ditch NamedTemporaryFile where it is not really needed.
Similarly to a static 'tripleoclient-hosts-portmaps.yaml',
use 'tripleo-hieradata-override.yaml' for the hieradata
generated file.

Change-Id: I437b8b552b4e6debfd9559977b1d001697106235
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
---
 tripleoclient/v1/tripleo_deploy.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

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