Merge "etcd: Get FQDN from hiera instead of puppet fact"

[apex-tripleo-heat-templates.git] / capabilities-map.yaml

diff --git a/capabilities-map.yaml b/capabilities-map.yaml
index dd85b9d..3028dcf 100644 (file)
--- a/capabilities-map.yaml
+++ b/capabilities-map.yaml
@@ -335,11 +335,6 @@ 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
@@ -472,6 +467,16 @@ topics:
             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