openstack
/
tripleo-heat-templates
Code Issues Proposed changes

[queens] Put back (now empty) fluentd-client.yaml 

This will allow us to get around a tricky error in heatclient template
processing with persisted user-environment.yaml on
upgrade. Interestingly, we need the old file to exist in the plan so
that we can map the resource to OS::Heat::None during the upgrade
process (heatclient tries to fetch it even though a subsequent env
file would map the resource to None), and all alternative solutions
are considerably worse than just putting the file back in place.

We will not need this file in Rocky as the resource will be mapped to
None before upgrading Q->R. This commit is specific for P->Q upgrade.

Change-Id: I39573cca4dc16a024582de562b850ecfa9bb1dfd
Co-Authored-By: Jose Luis Franco <jfrancoa@redhat.com>
Co-Authored-By: Sofer Athlan-Guyot <sathlang@redhat.com>
Closes-Bug: #1758406
This commit is contained in:
Jiri Stransky 2018-04-06 18:07:54 +02:00
parent 5752f29f42
commit f30d13561e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/services/fluentd-client.yaml Normal file
View File

@ -0,0 +1,4 @@
# This file is here only to get past heatclient environment processing
# error, and is only present for the Queens version of t-h-t.
# https://bugs.launchpad.net/tripleo/+bug/1758406
heat_template_version: ocata