Merge "Describe use of Manila/CephFS in capabilites_map"

capabilities-map.yaml

@@ -444,30 +444,49 @@ topics:
               configured via puppet
             requires:
               - overcloud-resource-registry-puppet.yaml
-      - title: Externally managed Ceph
+      - title: Ceph
         description: >
-          Enable the use of an externally managed Ceph cluster
+          Enable the use of Ceph in the overcloud
         environments:
           - file: environments/puppet-ceph-external.yaml
             title: Externally managed Ceph
-            description:
+            description: >
+              Configures the overcloud to use an externally managed Ceph cluster, via RBD driver.
             requires:
               - overcloud-resource-registry-puppet.yaml
-      - title: Ceph Devel
+          - file: environments/puppet-ceph.yaml
+            title: TripleO managed Ceph
+            description: >
+              Deploys a Ceph cluster via TripleO, requires at lease one CephStorage node or
+              use of hyperconverged-ceph.yaml environment for the HCI scenario, where CephOSD is
+              colocated with NovaCompute and configures the overcloud to use it, via RBD driver.
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+      - title: CephMDS
         description: >
-          Enable a Ceph storage cluster using the controller and 2 ceph nodes.
-          Rbd backends are enabled for Cinder, Glance, and Nova.
+          Deploys CephMDS via TripleO, an additional Ceph service needed to create shared
+          filesystems hosted in Ceph.
         environments:
-          - file: environments/puppet-ceph-devel.yaml
-            title: Ceph Devel
+          - file: environments/services/ceph-mds.yaml
+            title: Deploys CephMDS
             description:
+            requires:
+              - environments/puppet-ceph.yaml
+      - title: Manila with CephFS
+        description: >
+          Deploys Manila and configures it with the CephFS driver. This requires the deployment of
+          Ceph and CephMDS from TripleO or the use of an external Ceph cluster for the overcloud.
+        environments:
+          - file: environments/manila-cephfsnative-config.yaml
+            title: Deploys Manila with CephFS driver
+            description: Deploys Manila and configures CephFS as its default backend.
             requires:
               - overcloud-resource-registry-puppet.yaml
       - title: Storage Environment
         description: >
           Can be used to set up storage backends. Defaults to Ceph used as a
-          backend for Cinder, Glance and Nova ephemeral storage. It configures
-          for example which services will use Ceph, or if any of the services
+          backend for Cinder, Glance, Nova ephemeral storage and Gnocchi. It
+          configures which services will use Ceph, or if any of the services
           will use NFS. And more. Usually requires to be edited by user first.
         tags:
           - no-gui

environments/puppet-ceph.yaml

@@ -0,0 +1,12 @@
+resource_registry:
+  OS::TripleO::Services::CephMon: ../puppet/services/ceph-mon.yaml
+  OS::TripleO::Services::CephOSD: ../puppet/services/ceph-osd.yaml
+  OS::TripleO::Services::CephClient: ../puppet/services/ceph-client.yaml
+
+parameter_defaults:
+  CinderEnableIscsiBackend: false
+  CinderEnableRbdBackend: true
+  CinderBackupBackend: ceph
+  NovaEnableRbdBackend: true
+  GlanceBackend: rbd
+  GnocchiBackend: rbd