Merge "Use Ceph-NFS for Manila in scenario004" into stable/ussuri

This commit is contained in:
Zuul 2021-02-01 00:10:21 +00:00 committed by Gerrit Code Review
commit 6909f9bc80
2 changed files with 8 additions and 0 deletions

View File

@ -9,6 +9,7 @@ resource_registry:
OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
OS::TripleO::Services::CephMds: ../../deployment/ceph-ansible/ceph-mds.yaml
OS::TripleO::Services::CephNfs: ../../deployment/ceph-ansible/ceph-nfs.yaml
OS::TripleO::Services::CephRgw: ../../deployment/ceph-ansible/ceph-rgw.yaml
OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml
OS::TripleO::Services::SwiftProxy: OS::Heat::None
@ -92,3 +93,7 @@ parameter_defaults:
CephConfigOverrides:
globalkey: globalvalue
anotherkey: anothervalue
ManilaCephFSCephFSProtocolHelperType: 'NFS'
# Workaround for https://bugs.launchpad.net/tripleo/+bug/1911022
ExtraConfig:
ganesha_vip: 192.168.24.3

View File

@ -21,6 +21,8 @@
subnet: storage_subnet
StorageMgmt:
subnet: storage_mgmt_subnet
StorageNFS:
subnet: storage_nfs_subnet
Tenant:
subnet: tenant_subnet
ServicesDefault:
@ -44,6 +46,7 @@
- OS::TripleO::Services::CephMds
- OS::TripleO::Services::CephMgr
- OS::TripleO::Services::CephMon
- OS::TripleO::Services::CephNfs
- OS::TripleO::Services::CephRbdMirror
- OS::TripleO::Services::CephRgw
- OS::TripleO::Services::CephOSD