From bff0c6cfa1226836569ea016a71284e127c04b2c Mon Sep 17 00:00:00 2001 From: Alan Bishop Date: Thu, 2 Jul 2020 13:35:47 -0700 Subject: [PATCH] Fix default BlockStorageCinderVolume template The BlockStorageCinderVolume tripleo service (used by the BlockStorage and DistributedComputeHCI roles) is meant to deploy the cinder-volume service without pacemaker. Unfortunately, [1] inadvertently switched it to the pcmk version of the template, and this patch moves it back. [1] I0f61016df6a9f07971c5eab51cc9674a1458c66f Closes-Bug: #1886095 Change-Id: I182f8c5a8ce283b675aa18712e84fcd692200eb1 --- overcloud-resource-registry-puppet.j2.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 3a0d5d9ec3..ef9c1dce57 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -121,7 +121,8 @@ resource_registry: OS::TripleO::Services::CinderBackup: OS::Heat::None OS::TripleO::Services::CinderScheduler: deployment/cinder/cinder-scheduler-container-puppet.yaml OS::TripleO::Services::CinderVolume: deployment/cinder/cinder-volume-pacemaker-puppet.yaml - OS::TripleO::Services::BlockStorageCinderVolume: deployment/cinder/cinder-volume-pacemaker-puppet.yaml + # BlockStorageCinderVolume uses the non-pcmk cinder-volume template + OS::TripleO::Services::BlockStorageCinderVolume: deployment/cinder/cinder-volume-container-puppet.yaml OS::TripleO::Services::Keystone: deployment/keystone/keystone-container-puppet.yaml OS::TripleO::Services::GlanceApi: deployment/glance/glance-api-container-puppet.yaml OS::TripleO::Services::HeatApi: deployment/heat/heat-api-container-puppet.yaml