From: Benoît Knecht <bknecht@protonmail.ch>
Date: Mon, 11 May 2020 14:21:55 +0000 (+0200)
Subject: ceph-validate: Expand templates in rgw_create_pools
X-Git-Tag: v4.0.24~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8ae4bbd8ca95c5c297c64f759af92257c4bddcd8;p=ceph-ansible.git

ceph-validate: Expand templates in rgw_create_pools

Same fix as `ceph-rgw` for `rgw_create_pools` pool names that contain Jinja
templates.

See #5348 for details.

Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
(cherry picked from commit 444b46ea24a71f0e719296abc677a975afa8ac7f)
---

diff --git a/roles/ceph-validate/tasks/check_rgw_pools.yml b/roles/ceph-validate/tasks/check_rgw_pools.yml
index 7f59046e3..a4f5412c7 100644
--- a/roles/ceph-validate/tasks/check_rgw_pools.yml
+++ b/roles/ceph-validate/tasks/check_rgw_pools.yml
@@ -2,7 +2,7 @@
 - name: fail if ec_profile is not set for ec pools
   fail:
     msg: "ec_profile must be set for ec pools"
-  with_dict: "{{ rgw_create_pools }}"
+  loop: "{{ rgw_create_pools | dict2items }}"
   when:
     - item.value.type is defined
     - item.value.type == 'ec'
@@ -11,7 +11,7 @@
 - name: fail if ec_k is not set for ec pools
   fail:
     msg: "ec_k must be set for ec pools"
-  with_dict: "{{ rgw_create_pools }}"
+  loop: "{{ rgw_create_pools | dict2items }}"
   when:
     - item.value.type is defined
     - item.value.type == 'ec'
@@ -20,7 +20,7 @@
 - name: fail if ec_m is not set for ec pools
   fail:
     msg: "ec_m must be set for ec pools"
-  with_dict: "{{ rgw_create_pools }}"
+  loop: "{{ rgw_create_pools | dict2items }}"
   when:
     - item.value.type is defined
     - item.value.type == 'ec'