From c17c8066a8949133e29a75d05baed93331f87628 Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Wed, 15 Nov 2017 15:28:14 +0100 Subject: [PATCH] Remove too opinionated parameters from kubernetes.yaml environment 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 --- environments/kubernetes.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/environments/kubernetes.yaml b/environments/kubernetes.yaml index acb4b436ae..ea3b19947c 100644 --- a/environments/kubernetes.yaml +++ b/environments/kubernetes.yaml @@ -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