openstack/tripleo-heat-templates
Code Issues Proposed changes

Remove too opinionated parameters from kubernetes.yaml environment

Browse Source 
The settings being removed are remnants from early days of testing.

The flavor settings can directly conflict/confuse deployments with
quickstart, as the flavors are called oooq_control and oooq_compute
instead, and we shouldn't really need to set them here.

The ComputeServices setting will start breaking deployments as soon as
we want to deploy any APBs on the compute nodes.

Change-Id: I68d958a408594b169bd9bb09607f04c180f915b9
This commit is contained in:
Jiri Stransky 2017-11-15 15:28:14 +01:00
parent d3c991183f
commit c17c8066a8
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
environments/kubernetes.yaml
View File

@ -2,15 +2,3 @@ resource_registry:
OS::TripleO::Services::Docker: ../puppet/services/docker.yaml OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
OS::TripleO::Services::Kubernetes::Worker: ../extraconfig/services/kubernetes-worker.yaml OS::TripleO::Services::Kubernetes::Worker: ../extraconfig/services/kubernetes-worker.yaml
OS::TripleO::Services::Kubernetes::Master: ../extraconfig/services/kubernetes-master.yaml OS::TripleO::Services::Kubernetes::Master: ../extraconfig/services/kubernetes-master.yaml
parameter_defaults:
OvercloudControlFlavor: control
OvercloudComputeFlavor: compute
ComputeServices:
- OS::TripleO::Services::NovaCompute
- OS::TripleO::Services::NovaLibvirt
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Sshd
- OS::TripleO::Services::Kubernetes::Worker