Merge "Use Ceph-NFS for Manila in scenario004"

ci/environments/scenario004-standalone.yaml

@@ -10,6 +10,7 @@ resource_registry:
   OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
   OS::TripleO::Services::CephGrafana: ../../deployment/ceph-ansible/ceph-grafana.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
@@ -94,3 +95,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

roles/Standalone.yaml

@@ -25,6 +25,8 @@
       subnet: storage_subnet
     StorageMgmt:
       subnet: storage_mgmt_subnet
+    StorageNFS:
+      subnet: storage_nfs_subnet
     Tenant:
       subnet: tenant_subnet
   ServicesDefault:
@@ -48,6 +50,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