openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Move cephfs and cephfs_*_pool ceph-ansible parameters in -base" into stable/queens

This commit is contained in:
Zuul 2019-08-30 22:26:40 +00:00 committed by Gerrit Code Review
parent 6d137ea639 f53e6b9ed2
commit b64c0f238f
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
docker/services/ceph-ansible/ceph-base.yaml
View File

@ -134,6 +134,21 @@ parameters:
description: default minimum replication for RBD copies
type: number
default: 3
ManilaCephFSDataPoolName:
default: manila_data
type: string
ManilaCephFSMetadataPoolName:
default: manila_metadata
type: string
ManilaCephFSDataPoolPGNum:
default: 128
type: number
ManilaCephFSMetadataPoolPGNum:
default: 128
type: number
ManilaCephFSShareBackendName:
default: cephfs
type: string
ManilaCephFSCephFSAuthId:
default: manila
type: string
@ -363,3 +378,9 @@ outputs:
- {get_param: CephIPv6}
- ipv6
- ipv4
cephfs_data: {get_param: ManilaCephFSDataPoolName}
cephfs_metadata: {get_param: ManilaCephFSMetadataPoolName}
cephfs: {get_param: ManilaCephFSShareBackendName}
cephfs_pools:
- { name: {get_param: ManilaCephFSDataPoolName}, pgs: {get_param: ManilaCephFSDataPoolPGNum} }
- { name: {get_param: ManilaCephFSMetadataPoolName}, pgs: {get_param: ManilaCephFSMetadataPoolPGNum} }

22
docker/services/ceph-ansible/ceph-mds.yaml
View File

@ -35,21 +35,6 @@ parameters:
with ceph-authtool --gen-print-key.
type: string
hidden: true
ManilaCephFSDataPoolName:
default: manila_data
type: string
ManilaCephFSDataPoolPGNum:
default: 128
type: number
ManilaCephFSMetadataPoolName:
default: manila_metadata
type: string
ManilaCephFSMetadataPoolPGNum:
default: 128
type: number
ManilaCephFSShareBackendName:
default: cephfs
type: string
resources:
CephBase:
@ -83,9 +68,4 @@ outputs:
- ceph_mds_ansible_vars:
map_merge:
- {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
- cephfs_data: {get_param: ManilaCephFSDataPoolName}
cephfs_metadata: {get_param: ManilaCephFSMetadataPoolName}
cephfs: {get_param: ManilaCephFSShareBackendName}
cephfs_pools:
- { name: {get_param: ManilaCephFSDataPoolName}, pgs: {get_param: ManilaCephFSDataPoolPGNum} }
- { name: {get_param: ManilaCephFSMetadataPoolName}, pgs: {get_param: ManilaCephFSMetadataPoolPGNum} }
- {}