From e0b52904c05b8c2df0471f97ebc374af7f51324b Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Thu, 20 Sep 2018 14:33:25 +0200 Subject: [PATCH] Stop cap granting to empty pool when telemetry disabled Attempt to not create GnocchiRbdPool pool when it is set to empty string [1] resulted in related bug which was not resolved by originally proposed fix [2]. 1. https://review.openstack.org/#/c/575571 2. https://review.openstack.org/#/c/570043 Change-Id: Ie7a42822be89cced480302d40180b9972d191004 Closes-Bug: 1776987 --- docker/services/ceph-ansible/ceph-base.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml index 6ab77f49c6..bd6f0a741a 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/docker/services/ceph-ansible/ceph-base.yaml @@ -271,7 +271,10 @@ resources: - {get_param: CinderBackupRbdPoolName} - {get_param: NovaRbdPoolName} - {get_param: GlanceRbdPoolName} - - {get_param: GnocchiRbdPoolName} + - if: + - equals: [{get_param: GnocchiRbdPoolName}, ''] + - [] + - [{get_param: GnocchiRbdPoolName}] # CinderRbdExtraPools is a list (do not indent further) - {get_param: CinderRbdExtraPools} - yaql: