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 95df60103a)

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: ''

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 -%}

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 -%}

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 -%}