Merge "Enables support for configuring Cinder with Pure Storage FlashArray storage...

diff --combined capabilities-map.yaml
index 2a800a4,0130085..9afe1cd
--- 1/capabilities-map.yaml
--- 2/capabilities-map.yaml
+++ b/capabilities-map.yaml
@@@ -2,6 -2,12 +2,6 @@@
  # repository for deployment using puppet. It groups configuration by topic,
  # describes possible combinations of environments and resource capabilities.
  
 -# root_template: identifies repository's root template
 -# root_environment: identifies root_environment, this one is special in terms of
 -#   order in which the environments are merged before deploying. This one serves as
 -#   a base and it's parameters/resource_registry gets overridden by other environments
 -#   if used.
 -
  # topics:
  # High Level grouping by purpose of environments
  # Attributes:
@@@ -32,6 -38,8 +32,6 @@@
  # only when that given environment is used. (resource_type of that environment can
  # be implemented using multiple templates).
  
 -root_template: overcloud.yaml
 -root_environment: overcloud-resource-registry-puppet.yaml
  topics:
    - title: Base Resources Configuration
      description:
@@@ -362,16 -370,6 +362,16 @@@
              description: Enable FOS in the overcloud
              requires:
                - overcloud-resource-registry-puppet.yaml
 +          - file: environments/neutron-nsx.yaml
 +            title: Deploy NSX Services
 +            description:
 +            requires:
 +              - overcloud-resource-registry-puppet.yaml
 +          - file: environments/neutron-l2gw.yaml
 +            title: Neutron L2 gateway Service Plugin
 +            description: Enables Neutron L2 gateway Service Plugin
 +            requires:
 +              - overcloud-resource-registry-puppet.yaml
  
    - title: Nova Extensions
      description:
@@@ -404,6 -402,11 +404,11 @@@
          description: >
            Enable various Cinder backends
          environments:
+           - file: environments/cinder-pure-config.yaml
+             title: Cinder Pure Storage FlashArray backend
+             description:
+             requires:
+               - overcloud-resource-registry-puppet.yaml
            - file: environments/cinder-netapp-config.yaml
              title: Cinder NetApp backend
              description:
@@@ -549,7 -552,7 +554,7 @@@
          description: Enable monitoring agents
          environments:
            - file: environments/monitoring-environment.yaml
 -            title: enable monitoring agents
 +            title: Enable monitoring agents
              description:
              requires:
                - overcloud-resource-registry-puppet.yaml
@@@ -561,14 -564,6 +566,14 @@@
              description:
              requires:
                - overcloud-resource-registry-puppet.yaml
 +      - title: Performance monitoring
 +        description: Enable performance monitoring agents
 +        environments:
 +          - file: environments/collectd-environment.yaml
 +            title: Enable performance monitoring agents
 +            description:
 +            requires:
 +              - overcloud-resource-registry-puppet.yaml
  
    - title: Security Options
      description: Security Hardening Options
@@@ -602,8 -597,3 +607,8 @@@
          environments:
            - file: environments/cadf.yaml
              title: Keystone CADF auditing
 +      - title: SecureTTY Values
 +        description: Set values within /etc/securetty
 +        environments:
 +          - file: environments/securetty.yaml
 +            title: SecureTTY Values