openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
(cherry picked from commit 51624fa82d)
This commit is contained in:
Giulio Fidente 2019-07-19 10:55:07 +02:00
parent 3719af1666
commit 3746b91335
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
deployment/ceph-ansible/ceph-mds.yaml
View File

@ -84,21 +84,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: