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

This commit is contained in:
Zuul
2017-12-05 17:45:03 +00:00
committed by Gerrit Code Review

View File

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