openstack/tripleo-heat-templates
Code Issues Proposed changes

Deprecate Docker

Browse Source 
Docker is deprecated in Stein and will be removed in Train.
It is being replaced by Podman and Buildah.

blueprint podman-support
Change-Id: Id9ec9cbe9f879c2f437b234742118763d6d0f535
This commit is contained in:
Emilien Macchi 2019-02-19 10:41:58 -05:00
parent 72aa2dfc0a
commit 26a3d4336c
8 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
deployment/docker/docker-baremetal-ansible.yaml → deployment/deprecated/docker/docker-baremetal-ansible.yaml
View File

0
deployment/docker/docker-registry-baremetal-ansible.yaml → deployment/deprecated/docker/docker-registry-baremetal-ansible.yaml
View File

2
environments/docker-uc-light.yaml
View File

@ -1,6 +1,6 @@
# A lightweight UC for pre-provisioned deployed servers
resource_registry:
OS::TripleO::Services::Docker: ../deployment/docker/docker-baremetal-ansible.yaml
OS::TripleO::Services::Docker: ../deployment/deprecated/docker/docker-baremetal-ansible.yaml
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
# FIXME(bogdando): can not be switched yet due to puppet-base issues
# see https://review.openstack.org/#/c/563443

2
environments/docker.yaml
View File

@ -3,7 +3,7 @@
# Environment that enables Docker.
resource_registry:
OS::TripleO::Services::Docker: ../deployment/docker/docker-baremetal-ansible.yaml
OS::TripleO::Services::Docker: ../deployment/deprecated/docker/docker-baremetal-ansible.yaml
parameter_defaults:
ContainerCli: docker

2
environments/kubernetes.yaml
View File

@ -1,4 +1,4 @@
resource_registry:
OS::TripleO::Services::Docker: ../deployment/docker/docker-baremetal-ansible.yaml
OS::TripleO::Services::Docker: ../deployment/deprecated/docker/docker-baremetal-ansible.yaml
OS::TripleO::Services::Kubernetes::Worker: ../extraconfig/services/kubernetes-worker.yaml
OS::TripleO::Services::Kubernetes::Master: ../extraconfig/services/kubernetes-master.yaml

2
environments/openshift.yaml
View File

@ -1,5 +1,5 @@
resource_registry:
OS::TripleO::Services::Docker: ../deployment/docker/docker-baremetal-ansible.yaml
OS::TripleO::Services::Docker: ../deployment/deprecated/docker/docker-baremetal-ansible.yaml
OS::TripleO::Services::HAproxy: ../deployment/haproxy/haproxy-container-puppet.yaml
OS::TripleO::Services::Keepalived: ../deployment/keepalived/keepalived-container-puppet.yaml
OS::TripleO::Services::OpenShift::Infra: ../extraconfig/services/openshift-infra.yaml

2
overcloud-resource-registry-puppet.j2.yaml
View File

@ -313,7 +313,7 @@ resource_registry:
OS::TripleO::Services::Vpp: OS::Heat::None
OS::TripleO::Services::NeutronVppAgent: OS::Heat::None
OS::TripleO::Services::Podman: OS::Heat::None
OS::TripleO::Services::Docker: deployment/docker/docker-baremetal-ansible.yaml
OS::TripleO::Services::Docker: deployment/deprecated/docker/docker-baremetal-ansible.yaml
OS::TripleO::Services::DockerRegistry: OS::Heat::None
OS::TripleO::Services::ContainerImagePrepare: deployment/container-image-prepare/container-image-prepare-baremetal-ansible.yaml
OS::TripleO::Services::CertmongerUser: puppet/services/certmonger-user.yaml

5
releasenotes/notes/deprecate_docker_all-40eb568c9234a3d8.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Docker is deprecated in Stein and will be removed in Train. It is being
replaced by Podman and Buildah.