From ed060cc258c170e94eff76ee795e82262b62e0b7 Mon Sep 17 00:00:00 2001
From: mciecierski <mciecier@redhat.com>
Date: Tue, 11 Jan 2022 14:00:08 +0100
Subject: [PATCH] Set ephemeral-heat option to true by default for Wallaby+

Switches to use ephemeral heat by default in tripleo-upgrade for
Wallaby+ releases. Leaving tasks that depend on a system
installed Heat, for anybody who intentionally disabled ephemeral heat.

Change-Id: Ibbc97835421751b7c0264cd85041c228366d8a29
(cherry picked from commit 95df60103a2a7ad7d4e953ea7f1b11d08c2155d6)
---
 defaults/main.yml                          | 2 +-
 templates/overcloud_update_prepare.sh.j2   | 3 ---
 templates/overcloud_upgrade_converge.sh.j2 | 3 ---
 templates/overcloud_upgrade_prepare.sh.j2  | 3 ---
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index e21f8e8f..1d4c1360 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -314,7 +314,7 @@ stein_registry_params:
 rhsm_overcloud_env: ''
 
 # ephemeral heat enabled
-ephemeral_heat: false
+ephemeral_heat: true
 
 # extra args for update prepare and update converge
 extra_args: ''
diff --git a/templates/overcloud_update_prepare.sh.j2 b/templates/overcloud_update_prepare.sh.j2
index 6d0fd71b..2ce828e1 100644
--- a/templates/overcloud_update_prepare.sh.j2
+++ b/templates/overcloud_update_prepare.sh.j2
@@ -29,9 +29,6 @@ openstack overcloud update prepare ${PREPARE_ANSWER} \
     {% if tripleo_upgrade_validations_non_fatal|bool -%}
     --validation-errors-nonfatal \
     {% endif -%}
-    {% if ephemeral_heat|default(false)|bool -%}
-    --heat-type pod \
-    {% endif -%}
     {% if network_data_file|length >0 -%}
     -n {{ network_data_file }} \
     {% endif -%}
diff --git a/templates/overcloud_upgrade_converge.sh.j2 b/templates/overcloud_upgrade_converge.sh.j2
index ee777da5..018ea8d6 100644
--- a/templates/overcloud_upgrade_converge.sh.j2
+++ b/templates/overcloud_upgrade_converge.sh.j2
@@ -50,9 +50,6 @@ openstack overcloud upgrade converge ${CONVERGE_ANSWER} \
     --disable-validations \
     --deployed-server \
     {% endif -%}
-    {% if ephemeral_heat|default(false)|bool -%}
-    --heat-type pod \
-    {% endif -%}
     {% if network_data_file|length >0 -%}
     -n {{ network_data_file }} \
     {% endif -%}
diff --git a/templates/overcloud_upgrade_prepare.sh.j2 b/templates/overcloud_upgrade_prepare.sh.j2
index 4b778b34..8006798e 100644
--- a/templates/overcloud_upgrade_prepare.sh.j2
+++ b/templates/overcloud_upgrade_prepare.sh.j2
@@ -29,9 +29,6 @@ openstack overcloud upgrade prepare ${PREPARE_ANSWER} \
     --disable-validations \
     --deployed-server \
     {% endif -%}
-    {% if ephemeral_heat|default(false)|bool -%}
-    --heat-type pod \
-    {% endif -%}
     {% if network_data_file|length >0 -%}
     -n {{ network_data_file }} \
     {% endif -%}