openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Emilien Macchi 2019-12-28 18:13:18 -05:00
parent 38a95f12b1
commit 9018e4e42d
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ci/environments/scenario004-standalone.yaml
View File

@ -97,7 +97,8 @@ parameter_defaults:
- tty4 - tty4
- tty5 - tty5
- tty6 - tty6
# Remove ContainerCli once this scenario is tested on CentOS8 # Remove ContainerCli and EnablePaunch once this scenario is tested on CentOS8
ContainerCli: docker ContainerCli: docker
EnablePaunch: true
CephConfigOverrides: CephConfigOverrides:
globalkey: globalvalue globalkey: globalvalue

2
common/deploy-steps.j2
View File

@ -67,7 +67,7 @@ parameters:
description: Whether to run the puppet (baremetal) deployment tasks. description: Whether to run the puppet (baremetal) deployment tasks.
type: boolean type: boolean
EnablePaunch: EnablePaunch:
default: true default: false
description: Whether to run paunch during container deployment tasks. description: Whether to run paunch during container deployment tasks.
type: boolean type: boolean
DockerPuppetDebug: DockerPuppetDebug:

2
environments/docker-ha.yaml
View File

@ -26,3 +26,5 @@ resource_registry:
parameter_defaults: parameter_defaults:
ContainerCli: docker ContainerCli: docker
ClusterCommonTag: true ClusterCommonTag: true
# Remove EnablePaunch once HA is tested on CentOS8
EnablePaunch: true