diff --git a/deployment/docker/docker-baremetal-ansible.yaml b/deployment/deprecated/docker/docker-baremetal-ansible.yaml similarity index 100% rename from deployment/docker/docker-baremetal-ansible.yaml rename to deployment/deprecated/docker/docker-baremetal-ansible.yaml diff --git a/deployment/docker/docker-registry-baremetal-ansible.yaml b/deployment/deprecated/docker/docker-registry-baremetal-ansible.yaml similarity index 100% rename from deployment/docker/docker-registry-baremetal-ansible.yaml rename to deployment/deprecated/docker/docker-registry-baremetal-ansible.yaml diff --git a/environments/docker-uc-light.yaml b/environments/docker-uc-light.yaml index e3891b37fc..6959ef4fa5 100644 --- a/environments/docker-uc-light.yaml +++ b/environments/docker-uc-light.yaml @@ -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 diff --git a/environments/docker.yaml b/environments/docker.yaml index 17c60fc66d..39f46982bf 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -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 \ No newline at end of file diff --git a/environments/kubernetes.yaml b/environments/kubernetes.yaml index 34568bb721..6dd74a9f02 100644 --- a/environments/kubernetes.yaml +++ b/environments/kubernetes.yaml @@ -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 diff --git a/environments/openshift.yaml b/environments/openshift.yaml index b4b509b63f..a941e1ca74 100644 --- a/environments/openshift.yaml +++ b/environments/openshift.yaml @@ -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 diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index b2d713f78e..f560acb060 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -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 diff --git a/releasenotes/notes/deprecate_docker_all-40eb568c9234a3d8.yaml b/releasenotes/notes/deprecate_docker_all-40eb568c9234a3d8.yaml new file mode 100644 index 0000000000..52d52f5155 --- /dev/null +++ b/releasenotes/notes/deprecate_docker_all-40eb568c9234a3d8.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Docker is deprecated in Stein and will be removed in Train. It is being + replaced by Podman and Buildah.