From f30d13561e2c9a8745ab2668c3d69f3c44549b74 Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Fri, 6 Apr 2018 18:07:54 +0200 Subject: [PATCH] [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 Co-Authored-By: Sofer Athlan-Guyot Closes-Bug: #1758406 --- docker/services/fluentd-client.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 docker/services/fluentd-client.yaml diff --git a/docker/services/fluentd-client.yaml b/docker/services/fluentd-client.yaml new file mode 100644 index 0000000000..341bcd2e69 --- /dev/null +++ b/docker/services/fluentd-client.yaml @@ -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