diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml index 77b21cc263..a855c0b43a 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/docker/services/ceph-ansible/ceph-base.yaml @@ -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: diff --git a/docker/services/ceph-ansible/ceph-mds.yaml b/docker/services/ceph-ansible/ceph-mds.yaml index 62fa0614bb..3c4f6d2c5b 100644 --- a/docker/services/ceph-ansible/ceph-mds.yaml +++ b/docker/services/ceph-ansible/ceph-mds.yaml @@ -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: