openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Deprecate kubespray kubernetes install"

This commit is contained in:
Zuul 2019-10-15 21:06:29 +00:00 committed by Gerrit Code Review
parent 1d98473ab5 4b352b4ca4
commit 9a09779db4
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
environments/kubernetes.yaml
View File

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

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

@ -131,8 +131,8 @@ resource_registry:
OS::TripleO::Services::HeatApiCloudwatch: deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
OS::TripleO::Services::HeatEngine: deployment/heat/heat-engine-container-puppet.yaml
OS::TripleO::Services::Kernel: deployment/kernel/kernel-baremetal-ansible.yaml
OS::TripleO::Services::Kubernetes::Master: deployment/kubernetes/kubernetes-master-baremetal-ansible.yaml
OS::TripleO::Services::Kubernetes::Worker: deployment/kubernetes/kubernetes-worker-baremetal-ansible.yaml
OS::TripleO::Services::Kubernetes::Master: deployment/deprecated/kubernetes/kubernetes-master-baremetal-ansible.yaml
OS::TripleO::Services::Kubernetes::Worker: deployment/deprecated/kubernetes/kubernetes-worker-baremetal-ansible.yaml
OS::TripleO::Services::MySQL: deployment/database/mysql-container-puppet.yaml
OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None
OS::TripleO::Services::NeutronBgpVpnBagpipe: OS::Heat::None

4
releasenotes/notes/deprecate-kubernetes-services-69ca5ec733d24644.yaml Normal file
View File

@ -0,0 +1,4 @@
---
deprecations:
- |
Kubernetes installation via Kubespray has been deprecated.

2
zuul.d/layout.yaml
View File

@ -130,7 +130,7 @@
- ^ci/common/.*$
- ^coe/kubernetes.*$
- ^environments/kubernetes.*$
- ^deployment/kubernetes/.*$
- ^deployment/.*kubernetes/.*$
- ci/environments/scenario006-multinode.yaml
- ^deployed-server/.*$
- ^common/.*$