From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 14 Feb 2017 17:34:36 +0000 (+0000)
Subject: Merge "Describe use of Manila/CephFS in capabilites_map"
X-Git-Tag: opnfv-6.0.0~1080
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=854b5120cc04418b34e45a523d0ea67ae64a448e;p=apex-tripleo-heat-templates.git
Merge "Describe use of Manila/CephFS in capabilites_map"
---
854b5120cc04418b34e45a523d0ea67ae64a448e
diff --cc capabilities-map.yaml
index 7ed0deb4,9ae772eb..dd85b9d7
--- a/capabilities-map.yaml
+++ b/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