openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "env/docker: add ContainerCli"

This commit is contained in:
Zuul 2019-02-15 08:31:19 +00:00 committed by Gerrit Code Review
parent 85e14e2245 3e5488901a
commit 305e01669d
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