From 51624fa82da3daa5b4cdce664648f9d736bbc4ab Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Fri, 19 Jul 2019 10:55:07 +0200
Subject: [PATCH] Updates the cephfs_pools format to match that of
 openstack_pools

We did not keep the cephfs_pools format updated as we did with
openstack_pools; ceph-ansible rc11 has a backward incompat issue
with the old format.

Change-Id: Icac13112655cd1d51170829fb0ac897473d30eaf
Closes-Bug: 1837195
---
 deployment/ceph-ansible/ceph-mds.yaml | 32 ++++++++++++++++-----------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/deployment/ceph-ansible/ceph-mds.yaml b/deployment/ceph-ansible/ceph-mds.yaml
index 168d0ffebd..2bfda2e79a 100644
--- a/deployment/ceph-ansible/ceph-mds.yaml
+++ b/deployment/ceph-ansible/ceph-mds.yaml
@@ -90,21 +90,27 @@ resources:
       type: json
       value:
         vars:
-          cephfs_data: {get_param: ManilaCephFSDataPoolName}
-          cephfs_metadata: {get_param: ManilaCephFSMetadataPoolName}
-          cephfs: {get_param: ManilaCephFSShareBackendName}
           # Prefer CephPoolDefaultPgNum unless the (deprecated)
           # params value is different from their default.
-          if:
-          - or:
-            - deprecated_data_pool_pgnum
-            - deprecated_metadata_pool_pgnum
-          - cephfs_pools:
-            - { name: {get_param: ManilaCephFSDataPoolName}, pgs: {get_param: ManilaCephFSDataPoolPGNum} }
-            - { name: {get_param: ManilaCephFSMetadataPoolName}, pgs: {get_param: ManilaCephFSMetadataPoolPGNum} }
-          - cephfs_pools:
-            - { name: {get_param: ManilaCephFSDataPoolName}, pgs: {get_param: CephPoolDefaultPgNum} }
-            - { name: {get_param: ManilaCephFSMetadataPoolName}, pgs: {get_param: CephPoolDefaultPgNum} }
+          cephfs_data_pool:
+            application: cephfs
+            name: {get_param: ManilaCephFSDataPoolName}
+            pg_num:
+              if:
+              - deprecated_data_pool_pgnum
+              - {get_param: ManilaCephFSDataPoolPGNum}
+              - {get_param: CephPoolDefaultPgNum}
+            rule_name: replicated_rule
+          cephfs_metadata_pool:
+            application: cephfs
+            name: {get_param: ManilaCephFSMetadataPoolName}
+            pg_num:
+              if:
+              - deprecated_metadata_pool_pgnum
+              - {get_param: ManilaCephFSMetadataPoolPGNum}
+              - {get_param: CephPoolDefaultPgNum}
+            rule_name: replicated_rule
+          cephfs: {get_param: ManilaCephFSShareBackendName}
 
 outputs:
   role_data: