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 commit 04b1378ea1
)
This commit is contained in:
parent
30390bc619
commit
90e36a106a
@ -141,6 +141,22 @@ parameters:
|
||||
description: default minimum replication for RBD copies
|
||||
type: number
|
||||
default: 3
|
||||
ManilaCephFSDataPoolName:
|
||||
default: manila_data
|
||||
type: string
|
||||
ManilaCephFSMetadataPoolName:
|
||||
default: manila_metadata
|
||||
type: string
|
||||
# DEPRECATED options for compatibility with older versions
|
||||
ManilaCephFSDataPoolPGNum:
|
||||
default: 128
|
||||
type: number
|
||||
ManilaCephFSMetadataPoolPGNum:
|
||||
default: 128
|
||||
type: number
|
||||
ManilaCephFSShareBackendName:
|
||||
default: cephfs
|
||||
type: string
|
||||
ManilaCephFSCephFSAuthId:
|
||||
default: manila
|
||||
type: string
|
||||
@ -187,7 +203,16 @@ parameters:
|
||||
container is able to read/write to /var/lib/mistral/ceph_fetch
|
||||
type: string
|
||||
|
||||
parameter_groups:
|
||||
- label: deprecated
|
||||
description: Do not use deprecated params, they will be removed.
|
||||
parameters:
|
||||
- ManilaCephFSDataPoolPGNum
|
||||
- ManilaCephFSMetadataPoolPGNum
|
||||
|
||||
conditions:
|
||||
deprecated_data_pool_pgnum: {not: {equals: [{get_param: ManilaCephFSDataPoolPGNum}, 128]}}
|
||||
deprecated_metadata_pool_pgnum: {not: {equals: [{get_param: ManilaCephFSMetadataPoolPGNum}, 128]}}
|
||||
custom_registry_host:
|
||||
yaql:
|
||||
data: {get_param: DockerCephDaemonImage}
|
||||
@ -376,6 +401,27 @@ resources:
|
||||
- ipv6
|
||||
- ipv4
|
||||
dashboard_enabled: false
|
||||
# Prefer CephPoolDefaultPgNum unless the (deprecated)
|
||||
# params value is different from their default.
|
||||
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:
|
||||
|
@ -35,37 +35,6 @@ parameters:
|
||||
with ceph-authtool --gen-print-key.
|
||||
type: string
|
||||
hidden: true
|
||||
ManilaCephFSDataPoolName:
|
||||
default: manila_data
|
||||
type: string
|
||||
ManilaCephFSMetadataPoolName:
|
||||
default: manila_metadata
|
||||
type: string
|
||||
ManilaCephFSShareBackendName:
|
||||
default: cephfs
|
||||
type: string
|
||||
CephPoolDefaultPgNum:
|
||||
description: default pg_num to use for the RBD pools
|
||||
type: number
|
||||
default: 128
|
||||
# DEPRECATED options for compatibility with older versions
|
||||
ManilaCephFSDataPoolPGNum:
|
||||
default: 128
|
||||
type: number
|
||||
ManilaCephFSMetadataPoolPGNum:
|
||||
default: 128
|
||||
type: number
|
||||
|
||||
parameter_groups:
|
||||
- label: deprecated
|
||||
description: Do not use deprecated params, they will be removed.
|
||||
parameters:
|
||||
- ManilaCephFSDataPoolPGNum
|
||||
- ManilaCephFSMetadataPoolPGNum
|
||||
|
||||
conditions:
|
||||
deprecated_data_pool_pgnum: {not: {equals: [{get_param: ManilaCephFSDataPoolPGNum}, 128]}}
|
||||
deprecated_metadata_pool_pgnum: {not: {equals: [{get_param: ManilaCephFSMetadataPoolPGNum}, 128]}}
|
||||
|
||||
resources:
|
||||
CephBase:
|
||||
@ -83,28 +52,7 @@ resources:
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
vars:
|
||||
# Prefer CephPoolDefaultPgNum unless the (deprecated)
|
||||
# params value is different from their default.
|
||||
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}
|
||||
vars: {}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
|
Loading…
Reference in New Issue
Block a user