Browse Source

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

changes/40/773440/2
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
06f0fcd533
2 changed files with 8 additions and 0 deletions
  1. +5
    -0
      ci/environments/scenario004-standalone.yaml
  2. +3
    -0
      roles/Standalone.yaml

+ 5
- 0
ci/environments/scenario004-standalone.yaml View File

@ -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

+ 3
- 0
roles/Standalone.yaml View File

@ -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…
Cancel
Save