openstack
/
tripleo-heat-templates
Code Issues Proposed changes

env/docker: add ContainerCli 

This file will be used until we really get Podman everywhere (so when
CentOS 8 is out).
We still need Docker around for when Pacemaker is used. So this patch
will mainly be used by TripleO CI OVB jobs, so Docker can still be
deployed on the Overcloud, and not Podman.

blueprint podman-support

Change-Id: I80b07c83aae752b2b327a4570bc3df230f6a6319
This commit is contained in:
Emilien Macchi 2019-02-13 11:52:07 -05:00
parent 9689f6ed06
commit 3e5488901a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
environments/docker.yaml
View File

@ -1,3 +1,9 @@
# DEPRECATED: Containerized deployments are now default. This file
# will be removed.
resource_registry: {}
# DEPRECATED: Containerized deployments with Docker are deprecated. This file
# will be removed in Train release.
# Environment that enables Docker.
resource_registry:
OS::TripleO::Services::Docker: ../deployment/docker/docker-baremetal-ansible.yaml
parameter_defaults:
ContainerCli: docker