Merge "Use Ceph-NFS for Manila in scenario004" into stable/stein
This commit is contained in:
commit
06f0fcd533
|
@ -8,6 +8,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
|
||||
|
@ -99,3 +100,7 @@ parameter_defaults:
|
|||
ContainerCli: docker
|
||||
CephConfigOverrides:
|
||||
globalkey: globalvalue
|
||||
ManilaCephFSCephFSProtocolHelperType: 'NFS'
|
||||
# Workaround for https://bugs.launchpad.net/tripleo/+bug/1911022
|
||||
ExtraConfig:
|
||||
ganesha_vip: 192.168.24.3
|
||||
|
|
|
@ -21,6 +21,8 @@
|
|||
subnet: storage_subnet
|
||||
StorageMgmt:
|
||||
subnet: storage_mgmt_subnet
|
||||
StorageNFS:
|
||||
subnet: storage_nfs_subnet
|
||||
Tenant:
|
||||
subnet: tenant_subnet
|
||||
disable_constraints: True
|
||||
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue