From 48c6253835cc2fa6cabbd8f3c923bc59f8d75c2a Mon Sep 17 00:00:00 2001 From: Alan Bishop Date: Mon, 7 May 2018 08:23:05 -0400 Subject: [PATCH] Clean up Cinder backends in capabilities map Fix references to the NetApp and Veritas Hyperscale Cinder backend environment files. Also remove extraneous "configured via puppet" in the backend descriptions. Closes-Bug: #1769639 Change-Id: Ic5266abcafed5790296fd910b01aadf3d03900b5 --- capabilities-map.yaml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/capabilities-map.yaml b/capabilities-map.yaml index a644673a46..f965aed713 100644 --- a/capabilities-map.yaml +++ b/capabilities-map.yaml @@ -325,7 +325,7 @@ topics: description: requires: - overcloud-resource-registry-puppet.yaml - - file: environments/storage/cinder-netapp-config.yaml + - file: environments/cinder-netapp-config.yaml title: Cinder NetApp backend description: requires: @@ -343,22 +343,19 @@ topics: - file: environments/cinder-dellemc-vmax-iscsi-config.yaml title: Cinder Dell EMC VMAX ISCSI backend description: > - Enables a Cinder Dell EMC VMAX ISCSI backend, - configured via puppet + Enables a Cinder Dell EMC VMAX ISCSI backend requires: - overcloud-resource-registry-puppet.yaml - file: environments/cinder-dellemc-vnx-config.yaml title: Cinder Dell EMC VNX backend description: > - Enables a Cinder Dell EMC VNX backend, - configured via puppet + Enables a Cinder Dell EMC VNX backend requires: - overcloud-resource-registry-puppet.yaml - file: environments/cinder-dellemc-xtremio-iscsi-config.yaml title: Cinder Dell EMC XTREMIO Iscsi backend description: > - Enables a Cinder Dell EMC XTREMIO Iscsi backend, - configured via puppet + Enables a Cinder Dell EMC XTREMIO Iscsi backend requires: - overcloud-resource-registry-puppet.yaml - file: environments/cinder-hpelefthand-config.yaml @@ -376,18 +373,17 @@ topics: - file: environments/cinder-iser.yaml title: Cinder iSER backend description: > - Enable a Cinder iSER RDMA backend, configured via puppet + Enable a Cinder iSER RDMA backend - file: environments/cinder-scaleio-config.yaml title: Cinder Dell EMC ScaleIO backend description: > Enables a Cinder Dell EMC ScaleIO backend requires: - overcloud-resource-registry-puppet.yaml - - file: environments/cinder-veritas-hyperscale-config.yaml + - file: environments/veritas-hyperscale/cinder-veritas-hyperscale-config.yaml title: Cinder Veritas HyperScale backend description: > - Enables a Cinder Veritas HyperScale backend, - configured via puppet + Enables a Cinder Veritas HyperScale backend requires: - overcloud-resource-registry-puppet.yaml - title: Cinder backup service