From 8f4cd41c73038c60a7cab6657099a9feb4c5dec0 Mon Sep 17 00:00:00 2001 From: Alan Bishop Date: Fri, 28 Aug 2020 14:58:25 -0700 Subject: [PATCH] Remove Etcd from DCN roles that don't need it Remove the Etcd service from DCN roles that do not need it. Etcd is only required by the cinder-volume service in order to run in active/ active mode. Roles that do not host the cinder-volume service do not need Etcd. Change-Id: Ia24eed019ba973aad0e8f5b7fc0d53c1ee4149e8 (cherry picked from commit 500ba04798674ba487b370eb3a2c223cbaef9cd4) (cherry picked from commit ee90c5d60f285017603daa407d4201c8a47fa61c) --- roles/DistributedCompute.yaml | 1 - roles/DistributedComputeHCI.yaml | 2 +- roles/DistributedComputeHCIScaleOut.yaml | 3 +-- roles/DistributedComputeScaleOut.yaml | 3 +-- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/roles/DistributedCompute.yaml b/roles/DistributedCompute.yaml index efd17eda0b..864ee16803 100644 --- a/roles/DistributedCompute.yaml +++ b/roles/DistributedCompute.yaml @@ -31,7 +31,6 @@ - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - OS::TripleO::Services::Docker - - OS::TripleO::Services::Etcd - OS::TripleO::Services::GlanceApiEdge - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec diff --git a/roles/DistributedComputeHCI.yaml b/roles/DistributedComputeHCI.yaml index 7270892b75..1a8dc3b1c0 100644 --- a/roles/DistributedComputeHCI.yaml +++ b/roles/DistributedComputeHCI.yaml @@ -21,6 +21,7 @@ - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD - OS::TripleO::Services::BarbicanClient + - OS::TripleO::Services::BlockStorageCinderVolume - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient @@ -32,7 +33,6 @@ - OS::TripleO::Services::CephRgw - 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/DistributedComputeHCIScaleOut.yaml b/roles/DistributedComputeHCIScaleOut.yaml index 6fa270a99d..9c7e27a3b2 100644 --- a/roles/DistributedComputeHCIScaleOut.yaml +++ b/roles/DistributedComputeHCIScaleOut.yaml @@ -3,7 +3,7 @@ ############################################################################### - name: DistributedComputeHCIScaleOut description: | - Distributed Compute Node role with Ceph, Cinder volume and HAProxy for Glance. + Distributed Compute Node role with CephOSD and HAproxy for Glance. networks: InternalApi: subnet: internal_api_subnet @@ -34,7 +34,6 @@ - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - OS::TripleO::Services::Docker - - OS::TripleO::Services::Etcd - OS::TripleO::Services::HAproxyEdge - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec diff --git a/roles/DistributedComputeScaleOut.yaml b/roles/DistributedComputeScaleOut.yaml index f09ce25131..0898157057 100644 --- a/roles/DistributedComputeScaleOut.yaml +++ b/roles/DistributedComputeScaleOut.yaml @@ -3,7 +3,7 @@ ############################################################################### - name: DistributedComputeScaleOut description: | - Distributed Compute Node role with Cinder volume and HaProxy for Glance. + Distributed Compute Node role with HAproxy for Glance. CountDefault: 1 networks: InternalApi: @@ -31,7 +31,6 @@ - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - OS::TripleO::Services::Docker - - OS::TripleO::Services::Etcd - OS::TripleO::Services::HAproxyEdge - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec