Merge "Remove too opinionated parameters from kubernetes.yaml environment"

This commit is contained in:
Zuul 2017-11-21 12:56:01 +00:00 committed by Gerrit Code Review
commit 741859a5c8
1 changed files with 0 additions and 12 deletions

View File

@ -2,15 +2,3 @@ resource_registry:
OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
OS::TripleO::Services::Kubernetes::Worker: ../extraconfig/services/kubernetes-worker.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