X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=capabilities-map.yaml;h=66dc1d1d0376db4cd0aabad084d5662873afd03c;hb=46541750c93729b92dc9afb8022c2d16e5cec7af;hp=bfdedae7d79a44daf07f6692fcb0aee22c5a55a6;hpb=d5b44ae7dc03bf999b696f540061220fe6137b11;p=apex-tripleo-heat-templates.git

diff --git a/capabilities-map.yaml b/capabilities-map.yaml
index bfdedae7..66dc1d1d 100644
--- a/capabilities-map.yaml
+++ b/capabilities-map.yaml
@@ -335,21 +335,11 @@ topics:
             description: Enables Neutron Nuage backend on the controller
             requires:
               - overcloud-resource-registry-puppet.yaml
-          - file: environments/neutron-opencontrail.yaml
-            title: OpenContrail Extensions
-            description: Enables OpenContrail extensions
-            requires:
-              - overcloud-resource-registry-puppet.yaml
           - file: environments/neutron-opendaylight.yaml
             title: OpenDaylight
             description: Enables OpenDaylight
             requires:
               - overcloud-resource-registry-puppet.yaml
-          - file: environments/neutron-opendaylight-l3.yaml
-            title: OpenDaylight with L3 DVR
-            description: Enables OpenDaylight with L3 DVR
-            requires:
-              - overcloud-resource-registry-puppet.yaml
           - file: environments/neutron-ovs-dpdk.yaml
             title: DPDK with OVS
             description: Deploy DPDK with OVS
@@ -413,10 +403,10 @@ topics:
             requires:
               - overcloud-resource-registry-puppet.yaml
           - file: environments/cinder-dellsc-config.yaml
-            title: Cinder Dell Storage Center ISCSI backend
+            title: Cinder Dell EMC Storage Center ISCSI backend
             description: >
-              Enables a Cinder Dell Storage Center ISCSI backend, configured
-              via puppet
+              Enables a Cinder Dell EMC Storage Center ISCSI backend,
+              configured via puppet
             requires:
               - overcloud-resource-registry-puppet.yaml
           - file: environments/cinder-hpelefthand-config.yaml
@@ -437,32 +427,66 @@ topics:
             title: Cinder iSER backend
             description: >
               Enable a Cinder iSER RDMA backend, configured via puppet
+          - file: environments/cinder-scaleio-config.yaml
+            title: Cinder Dell EMC ScaleIO backend
+            description: >
+              Enables a Cinder Dell EMC ScaleIO backend,
+              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
+          - 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: Ceph Devel
+      - 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: Ceph Rados Gateway
+        description: >
+          Deploys CephRGW via TripleO, transparently replaces Swift providing a compatible API
+          which stores data in the Ceph cluster.
+        environments:
+          - file: environments/ceph-radosgw.yaml
+            title: Deploys CephRGW
+            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
@@ -510,14 +534,6 @@ topics:
             description:
             requires:
               - overcloud-resource-registry-puppet.yaml
-      - title: Manage Firewall
-        description:
-        environments:
-          - file: environments/manage-firewall.yaml
-            title: Manage Firewall
-            description:
-            requires:
-              - overcloud-resource-registry-puppet.yaml
 
   - title: Operational Tools
     description:
@@ -566,3 +582,8 @@ topics:
             description:
             requires:
               - overcloud-resource-registry-puppet.yaml
+      - title: Keystone CADF auditing
+        description: Enable CADF notifications in Keystone for auditing
+        environments:
+          - file: environments/cadf.yaml
+            title: Keystone CADF auditing