From 9018e4e42d60270a40378d792e319b7cd58302d6 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Sat, 28 Dec 2019 18:13:18 -0500
Subject: [PATCH] Disable Paunch by default Standalone/Overcloud

Except for standalone004 and ovb-ha jobs which still run on Docker,
let's enable tripleo-ansible to manage the containers instead of paunch.

Depends-On: https://review.opendev.org/#/c/709043
Change-Id: Ib29e7c9ce4028e1cb6f6ea6c0ae77890aefde93b
---
 ci/environments/scenario004-standalone.yaml | 3 ++-
 common/deploy-steps.j2                      | 2 +-
 environments/docker-ha.yaml                 | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml
index cadf88fadc..c9c1e5dbe0 100644
--- a/ci/environments/scenario004-standalone.yaml
+++ b/ci/environments/scenario004-standalone.yaml
@@ -97,7 +97,8 @@ parameter_defaults:
     - tty4
     - tty5
     - tty6
-  # Remove ContainerCli once this scenario is tested on CentOS8
+  # Remove ContainerCli and EnablePaunch once this scenario is tested on CentOS8
   ContainerCli: docker
+  EnablePaunch: true
   CephConfigOverrides:
     globalkey: globalvalue
diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 29f0cdee33..970b202307 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -67,7 +67,7 @@ parameters:
     description: Whether to run the puppet (baremetal) deployment tasks.
     type: boolean
   EnablePaunch:
-    default: true
+    default: false
     description: Whether to run paunch during container deployment tasks.
     type: boolean
   DockerPuppetDebug:
diff --git a/environments/docker-ha.yaml b/environments/docker-ha.yaml
index 1526184fc2..20e37f10ae 100644
--- a/environments/docker-ha.yaml
+++ b/environments/docker-ha.yaml
@@ -26,3 +26,5 @@ resource_registry:
 parameter_defaults:
   ContainerCli: docker
   ClusterCommonTag: true
+  # Remove EnablePaunch once HA is tested on CentOS8
+  EnablePaunch: true