Merge "Describe use of Manila/CephFS in capabilites_map"
authorJenkins <jenkins@review.openstack.org>
Tue, 14 Feb 2017 17:34:36 +0000 (17:34 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 14 Feb 2017 17:34:36 +0000 (17:34 +0000)
1  2 
capabilities-map.yaml

@@@ -437,16 -436,11 +437,16 @@@ 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