Browse Source

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

tags/9.4.1
Zuul Gerrit Code Review 9 months ago
parent
commit
69daaaeb38
2 changed files with 22 additions and 22 deletions
  1. +21
    -0
      docker/services/ceph-ansible/ceph-base.yaml
  2. +1
    -22
      docker/services/ceph-ansible/ceph-mds.yaml

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

@@ -135,6 +135,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
@@ -357,6 +372,12 @@ resources:
- {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} }

outputs:
role_data:


+ 1
- 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:
@@ -67,13 +52,7 @@ resources:
properties:
type: json
value:
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} }
vars: {}

outputs:
role_data:


Loading…
Cancel
Save