From e81a3f8d36501253c925b8403d404a953a53466f Mon Sep 17 00:00:00 2001 From: John Fulton Date: Tue, 18 Feb 2020 15:15:37 -0500 Subject: [PATCH] Remove BlockStorageCinderVolume service from certain DCN roles The ScaleOut roles should accompany the DistributedCompute roles which are sufficient to provide the BlockStorageCinderVolume service. The DistributedCompute role supports usecases without persistent storage via Cinder while the DistributedComputeHCI supports usecases with persistent storage via Cinder. For those usecases we want the BlockStorageCinderVolume service to be used by DistributedComputeHCI with Ceph but not without Ceph as that is presently the only Cinder backend supporting active/active. Change-Id: I8588919cecc2be06447eba2b53b79d8d7cfc6a9e Fixes-Bug: #1863799 --- roles/DistributedCompute.yaml | 3 +-- roles/DistributedComputeHCIScaleOut.yaml | 1 - roles/DistributedComputeScaleOut.yaml | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/roles/DistributedCompute.yaml b/roles/DistributedCompute.yaml index a4665fe3cd..a80c28c1bd 100644 --- a/roles/DistributedCompute.yaml +++ b/roles/DistributedCompute.yaml @@ -3,7 +3,7 @@ ############################################################################### - name: DistributedCompute description: | - Distributed Compute Node role with Cinder volume and Glance. + Distributed Compute Node role with Glance. CountDefault: 1 networks: InternalApi: @@ -23,7 +23,6 @@ - OS::TripleO::Services::CephClient - OS::TripleO::Services::CephExternal - OS::TripleO::Services::CertmongerUser - - OS::TripleO::Services::BlockStorageCinderVolume - OS::TripleO::Services::Collectd - OS::TripleO::Services::ComputeCeilometerAgent - OS::TripleO::Services::ComputeNeutronCorePlugin diff --git a/roles/DistributedComputeHCIScaleOut.yaml b/roles/DistributedComputeHCIScaleOut.yaml index e444b8836a..069c6e074b 100644 --- a/roles/DistributedComputeHCIScaleOut.yaml +++ b/roles/DistributedComputeHCIScaleOut.yaml @@ -26,7 +26,6 @@ - OS::TripleO::Services::CephExternal - OS::TripleO::Services::CephOSD - OS::TripleO::Services::CertmongerUser - - OS::TripleO::Services::BlockStorageCinderVolume - OS::TripleO::Services::Collectd - OS::TripleO::Services::ComputeCeilometerAgent - OS::TripleO::Services::ComputeNeutronCorePlugin diff --git a/roles/DistributedComputeScaleOut.yaml b/roles/DistributedComputeScaleOut.yaml index 2a6f45ce62..c0be2c1286 100644 --- a/roles/DistributedComputeScaleOut.yaml +++ b/roles/DistributedComputeScaleOut.yaml @@ -23,7 +23,6 @@ - OS::TripleO::Services::CephClient - OS::TripleO::Services::CephExternal - OS::TripleO::Services::CertmongerUser - - OS::TripleO::Services::BlockStorageCinderVolume - OS::TripleO::Services::Collectd - OS::TripleO::Services::ComputeCeilometerAgent - OS::TripleO::Services::ComputeNeutronCorePlugin