Merge "Update capabilities-map.yaml to include latest storage environments"

capabilities-map.yaml

@@ -46,14 +46,22 @@ topics:
             description:
             requires:
               - overcloud-resource-registry-puppet.yaml
+          - file: environments/containers-default-parameters.yaml
+            title: Default Container Images
+            description: Use Default Container Images
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+              - environments/docker.yaml
       - title: High Availability
         description: Enables configuration of an Overcloud Controller with Pacemaker
         environments:
-          - file: environments/puppet-pacemaker.yaml
-            title: High Availability (Pacemaker)
-            description:
+          - file: environments/docker-ha.yaml
+            title: HA services via Docker
+            description: Deploy the HA services via Docker
             requires:
               - overcloud-resource-registry-puppet.yaml
+              - environments/docker.yaml
+        mutually_exclusive: true
 
   - title: Network Configuration
     description:
@@ -377,15 +385,14 @@ topics:
         description: >
           Enable the use of Ceph in the overcloud
         environments:
-          - file: environments/puppet-ceph.yaml
+          - file: environments/ceph-ansible/ceph-ansible.yaml
             title: Ceph Storage Backend
             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.
+              Include this option to enable Ceph as the backend for
+              Cinder, Nova, Gnocchi, and Glance.
             requires:
               - overcloud-resource-registry-puppet.yaml
-          - file: environments/storage/external-ceph.yaml
+          - file: environments/ceph-ansible/ceph-ansible-external.yaml
             title: Externally managed Ceph
             description: >
               Configures the overcloud to use an externally managed Ceph cluster, via RBD driver.
@@ -395,21 +402,21 @@ topics:
       - title: Additional Ceph Options
         description:
         environments:
-          - file: environments/services/ceph-mds.yaml
+          - file: environments/ceph-ansible/ceph-mds.yaml
             title: Deploys CephMDS
             description: >
               Deploys CephMDS via TripleO, an additional Ceph service needed to create shared
               filesystems hosted in Ceph.
             requires:
-              - environments/puppet-ceph.yaml
-          - file: environments/ceph-radosgw.yaml
+              - environments/ceph-ansible/ceph-ansible.yaml
+          - file: environments/ceph-ansible/ceph-rgw.yaml
             title: Ceph Rados Gateway
             description: >
               Deploys CephRGW via TripleO, transparently replaces Swift providing a compatible API
               which stores data in the Ceph cluster.
             requires:
-              - environments/puppet-ceph.yaml
-          - file: environments/manila-cephfsnative-config.yaml
+              - environments/ceph-ansible/ceph-ansible.yaml
+          - file: environments/manila-cephfsnative-config-docker.yaml
             title: Manila with CephFS
             description: >
               Deploys Manila and configures it with the CephFS driver. This requires the deployment of