From b95d1c18d8fd7e2d2c6fce3da281e7a77ea695f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Thu, 7 Jun 2018 14:58:54 +0200 Subject: [PATCH] Map OpenShift resources to services Also remove OS::Heat::None mappings for resources that are not part of the deployed roles. Depends-On: I85c4390519ace0149895285225f5a4ece453f1f8 Change-Id: I55e8b25a4fb0b4839be5d741acdceec5dad903ad --- ci/environments/scenario009-multinode.yaml | 28 ++-------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/ci/environments/scenario009-multinode.yaml b/ci/environments/scenario009-multinode.yaml index 926e42c298..e396f9e5de 100644 --- a/ci/environments/scenario009-multinode.yaml +++ b/ci/environments/scenario009-multinode.yaml @@ -1,32 +1,8 @@ resource_registry: OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml - OS::TripleO::Services::SwiftProxy: OS::Heat::None - OS::TripleO::Services::SwiftStorage: OS::Heat::None - OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None - OS::TripleO::Services::Keystone: OS::Heat::None - OS::TripleO::Services::GlanceApi: OS::Heat::None - OS::TripleO::Services::MySQL: OS::Heat::None - OS::TripleO::Services::MySQLClient: OS::Heat::None - OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None - OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None - OS::TripleO::Services::NeutronL3Agent: OS::Heat::None - OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None - OS::TripleO::Services::NeutronServer: OS::Heat::None - OS::TripleO::Services::NeutronCorePlugin: OS::Heat::None - OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None - OS::TripleO::Services::RabbitMQ: OS::Heat::None - OS::TripleO::Services::HAproxy: OS::Heat::None - OS::TripleO::Services::Keepalived: OS::Heat::None - OS::TripleO::Services::Memcached: OS::Heat::None - OS::TripleO::Services::NovaConductor: OS::Heat::None - OS::TripleO::Services::NovaApi: OS::Heat::None - OS::TripleO::Services::NovaPlacement: OS::Heat::None - OS::TripleO::Services::NovaMetadata: OS::Heat::None - OS::TripleO::Services::NovaScheduler: OS::Heat::None - OS::TripleO::Services::NovaCompute: OS::Heat::None - OS::TripleO::Services::NovaLibvirt: OS::Heat::None - + OS::TripleO::Services::OpenShift::Master: ../../extraconfig/services/openshift-master.yaml + OS::TripleO::Services::OpenShift::Worker: ../../extraconfig/services/openshift-worker.yaml parameter_defaults: