Move cephfs and cephfs_*_pool ceph-ansible parameters in -base
We have to move these into the -base service so they are dumped in "all" ansible group vars and correctly consumed by nfs role when not colocated with mds. Closes-Bug: 1840651 Change-Id: I7aec1b80e0f598fc86720d669151958ca7b2e01d (cherry picked from commit04b1378ea1
) (cherry picked from commit90e36a106a
) (cherry picked from commit3b61e285be
)
This commit is contained in:
parent
f16a588ad8
commit
f53e6b9ed2
|
@ -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} }
|
||||
|
|
|
@ -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} }
|
||||
- {}
|
||||
|
|
Loading…
Reference in New Issue