Merge "Update capabilities-map.yaml"

1 files changed, 282 insertions, 22 deletions

diff --git a/capabilities-map.yaml b/capabilities-map.yaml
index 14d50f19..ae747621 100644
--- a/capabilities-map.yaml
+++ b/capabilities-map.yaml
@@ -41,17 +41,17 @@
 root_template: overcloud.yaml
 root_environment: overcloud-resource-registry-puppet.yaml
 topics:
-  - title: Basic Configuration
+  - title: Base Resources Configuration
     description:
     environment_groups:
       - title:
-        description: Enable basic configuration required for OpenStack Deployment
+        description: Enable base configuration for all resources required for OpenStack Deployment
         environments:
           - file: overcloud-resource-registry-puppet.yaml
-            title: Default Configuration
+            title: Base resources configuration
             description:
 
-  - title: Deployment options
+  - title: Deployment Options
     description:
     environment_groups:
       - title: High Availability
@@ -62,6 +62,15 @@ topics:
             description: Enable configuration of an Overcloud controller with Pacemaker
             requires:
               - overcloud-resource-registry-puppet.yaml
+      - title: Pacemaker options
+        description:
+        environments:
+          - file: environments/puppet-pacemaker-no-restart.yaml
+            title: Pacemaker No Restart
+            description:
+            requires:
+              - environments/puppet-pacemaker.yaml
+              - overcloud-resource-registry-puppet.yaml
       - title: Docker RDO
         description: >
           Docker container with heat agents for containerized compute node
@@ -71,26 +80,114 @@ topics:
             description:
             requires:
               - overcloud-resource-registry-puppet.yaml
+      - title: Enable TLS
+        description: >
+        environments:
+          - file: environments/enable-tls.yaml
+            title: TLS
+            description: >
+              Use this option to pass in certificates for SSL deployments.
+              For these values to take effect, one of the TLS endpoints
+              environments must also be used.
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+      - title: TLS Endpoints
+        description: >
+        environments:
+          - file: environments/tls-endpoints-public-dns.yaml
+            title: SSL-enabled deployment with DNS name as public endpoint
+            description: >
+              Use this environment when deploying an SSL-enabled overcloud where the public
+              endpoint is a DNS name.
+            requires:
+              - environments/enable-tls.yaml
+              - overcloud-resource-registry-puppet.yaml
+          - file: environments/tls-endpoints-public-ip.yaml
+            title: SSL-enabled deployment with IP address as public endpoint
+            description: >
+              Use this environment when deploying an SSL-enabled overcloud where the public
+              endpoint is an IP address.
+            requires:
+              - environments/enable-tls.yaml
+              - overcloud-resource-registry-puppet.yaml
+      - title: External load balancer
+        description: >
+          Enable external load balancer
+        environments:
+          - file: environments/external-loadbalancer-vip-v6.yaml
+            title: External load balancer IPv6
+            description: >
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+          - file: environments/external-loadbalancer-vip.yaml
+            title: External load balancer IPv4
+            description: >
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+
+  - title: Additional Services
+    description: Deploy additional Overcloud services
+    environment_groups:
+      - title: Manila
+        description:
+        environments:
+          - file: environments/manila-generic-config.yaml
+            title: Manila
+            description: Enable Manila generic driver backend
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+      - title: Sahara
+        description:
+        environments:
+          - file: environments/services/sahara.yaml
+            title: Sahara
+            description: Deploy Sahara service
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+      - title: Ironic
+        description:
+        environments:
+          - file: environments/services/ironic.yaml
+            title: Ironic
+            description: Deploy Ironic service
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+      - title: Mistral
+        description:
+        environments:
+          - file: environments/services/mistral.yaml
+            title: Mistral
+            description: Deploy Mistral service
+            requires:
+              - overcloud-resource-registry-puppet.yaml
 
   # - title: Network Interface Configuration
   #   description:
   #   environment_groups:
 
-  - title: Overlay network Configuration
+  - title: Overlay Network Configuration
     description:
     environment_groups:
       - title: Network Isolation
-        description: >
-          Enable the creation of Neutron networks for
-          isolated Overcloud traffic and configure each role to assign ports
-          (related to that role) on these networks.
+        description:
         environments:
           - file: environments/network-isolation.yaml
             title: Network Isolation
-            description: Enable Network Isolation
+            description: >
+              Enable the creation of Neutron networks for
+              isolated Overcloud traffic and configure each role to assign ports
+              (related to that role) on these networks.
             requires:
               - overcloud-resource-registry-puppet.yaml
-      - title: Single nic or Bonding
+          - file: environments/network-isolation-v6.yaml
+            title: Network Isolation IPv6
+            description: >
+              Enable the creation of IPv6 Neutron networks for isolated Overcloud
+              traffic and configure each role to assign ports (related
+              to that role) on these networks.
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+      - title: Single NIC or Bonding
         description: >
           Configure roles to use pair of bonded nics or to use Vlans on a
           single nic. This option assumes use of Network Isolation.
@@ -104,23 +201,105 @@ topics:
             requires:
               - environments/network-isolation.yaml
               - overcloud-resource-registry-puppet.yaml
+          - file: environments/net-bond-with-vlans-no-external.yaml
+            title: Bond with Vlans No External Ports
+            description: >
+              Configure each role to use a pair of bonded nics (nic2 and
+              nic3) and configures an IP address on each relevant isolated network
+              for each role. This option assumes use of Network Isolation.
+              Sets external ports to noop.
+            requires:
+              - environments/network-isolation.yaml
+              - overcloud-resource-registry-puppet.yaml
+          - file: environments/net-bond-with-vlans-v6.yaml
+            title: Bond with Vlans IPv6
+            description: >
+              Configure each role to use a pair of bonded nics (nic2 and
+              nic3) and configures an IP address on each relevant isolated network
+              for each role, with IPv6 on the External network.
+              This option assumes use of Network Isolation IPv6.
+            requires:
+              - environments/network-isolation-v6.yaml
+              - overcloud-resource-registry-puppet.yaml
+          - file: environments/net-multiple-nics.yaml
+            title: Multiple NICs
+            description: >
+              Configures each role to use a separate NIC for
+              each isolated network.
+              This option assumes use of Network Isolation.
+            requires:
+              - environments/network-isolation.yaml
+              - overcloud-resource-registry-puppet.yaml
+          - file: environments/net-multiple-nics-v6.yaml
+            title: Multiple NICs IPv6
+            description: >
+              Configure each role to use a separate NIC for
+              each isolated network with IPv6 on the External network.
+              This option assumes use of Network Isolation IPv6.
+            requires:
+              - environments/network-isolation-v6.yaml
+              - overcloud-resource-registry-puppet.yaml
           - file: environments/net-single-nic-with-vlans.yaml
-            title: Single nic with Vlans
+            title: Single NIC with Vlans
             description: >
-              Configure each role to use Vlans on a single nic for
+              Configure each role to use Vlans on a single NIC for
               each isolated network. This option assumes use of Network Isolation.
             requires:
               - environments/network-isolation.yaml
               - overcloud-resource-registry-puppet.yaml
+          - file: environments/net-single-nic-with-vlans-no-external.yaml
+            title: Single NIC with Vlans No External Ports
+            description: >
+              Configure each role to use Vlans on a single NIC for
+              each isolated network. This option assumes use of Network Isolation.
+              Sets external ports to noop.
+            requires:
+              - environments/network-isolation.yaml
+              - overcloud-resource-registry-puppet.yaml
+          - file: environments/net-single-nic-linux-bridge-with-vlans.yaml
+            title: Single NIC with Linux Bridge Vlans
+            description: >
+              Configure each role to use Vlans on a single NIC for
+              each isolated network. This option assumes use of Network Isolation.
+            requires:
+              - environments/network-isolation.yaml
+              - overcloud-resource-registry-puppet.yaml
+          - file: environments/net-single-nic-with-vlans-v6.yaml
+            title: Single NIC with Vlans IPv6
+            description: >
+              Configures each role to use Vlans on a single NIC for
+              each isolated network with IPv6 on the External network.
+              This option assumes use of Network Isolation IPv6
+            requires:
+              - environments/network-isolation-v6.yaml
+              - overcloud-resource-registry-puppet.yaml
+      - title: Management Network
+        description: >
+          Enable the creation of a system management network. This
+          creates a Neutron network for isolated Overcloud
+          system management traffic and configures each role to
+          assign a port (related to that role) on that network.
+        environments:
+          - file: environments/network-management.yaml
+            title: Management Network
+            description:
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+          - file: environments/network-management-v6.yaml
+            title: Management Network IPv6
+            description:
+            requires:
+              - overcloud-resource-registry-puppet.yaml
 
   - title: Neutron Plugin Configuration
     description:
     environment_groups:
-      - title: BigSwitch extensions or Cisco N1KV backend
-        description:
+      - title: Neutron Plugins
+        description: >
+          Enable various Neutron plugins and backends
         environments:
           - file: environments/neutron-ml2-bigswitch.yaml
-            title: BigSwitch extensions
+            title: BigSwitch Extensions
             description: >
               Enable Big Switch extensions, configured via puppet
             requires:
@@ -131,28 +310,101 @@ topics:
               Enable a Cisco N1KV backend, configured via puppet
             requires:
               - overcloud-resource-registry-puppet.yaml
-      - title: Cisco Neutron plugin
-        description: >
-          Enable a Cisco Neutron plugin
-        environments:
           - file: environments/neutron-ml2-cisco-nexus-ucsm.yaml
             title: Cisco Neutron plugin
             description:
             requires:
               - overcloud-resource-registry-puppet.yaml
+          - file: environments/neutron-midonet.yaml
+            title: Deploy MidoNet Services
+            description:
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+          - file: environments/neutron-nuage-config.yaml
+            title: Neutron Nuage backend
+            description: Enables Neutron Nuage backend on the controller
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+          - file: environments/neutron-opencontrail.yaml
+            title: OpenContrail Extensions
+            description: Enables OpenContrail extensions
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+          - file: environments/neutron-opendaylight.yaml
+            title: OpenDaylight
+            description: Enables OpenDaylight
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+          - file: environments/neutron-opendaylight-l3.yaml
+            title: OpenDaylight with L3 DVR
+            description: Enables OpenDaylight with L3 DVR
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+          - file: environments/neutron-ovs-dpdk.yaml
+            title: DPDK with OVS
+            description: Deploy DPDK with OVS
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+          - file: environments/neutron-ovs-dvr.yaml
+            title: DVR
+            description: Enables DVR in the Overcloud
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+          - file: environments/neutron-plumgrid.yaml
+            title: PLUMgrid extensions
+            description: Enables PLUMgrid extensions
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+
+  - title: Nova Extensions
+    description:
+    environment_groups:
+      - title: Nova Extensions
+        description:
+        environments:
+          - file: environments/nova-nuage-config.yaml
+            title: Nuage backend
+            description: >
+              Enables Nuage backend on the Compute
+            requires:
+              - overcloud-resource-registry-puppet.yaml
 
   - title: Storage
     description:
     environment_groups:
-      - title: Cinder NetApp backend
+      - title: Cinder backup service
+        description:
+        environments:
+          - file: environments/cinder-backup.yaml
+            title: Cinder backup service
+            description: >
+              OpenStack Cinder Backup service with Pacemaker configured
+              with Puppet
+            requires:
+              - environments/puppet-pacemaker.yaml
+              - overcloud-resource-registry-puppet.yaml
+      - title: Cinder backend
         description: >
-          Enable a Cinder NetApp backend, configured via puppet
+          Enable various Cinder backends
         environments:
           - file: environments/cinder-netapp-config.yaml
             title: Cinder NetApp backend
             description:
             requires:
               - overcloud-resource-registry-puppet.yaml
+          - file: environments/cinder-dellsc-config.yaml
+            title: Cinder Dell Storage Center ISCSI backend
+            description: >
+              Enables a Cinder Dell Storage Center ISCSI backend, configured
+              via puppet
+            requires:
+              - overcloud-resource-registry-puppet.yaml
+          - file: environments/cinder-eqlx-config.yaml
+            title: Cinder EQLX backend
+            description: >
+              Enables a Cinder EQLX backend, configured via puppet
+            requires:
+              - overcloud-resource-registry-puppet.yaml
       - title: Externally managed Ceph
         description: >
           Enable the use of an externally managed Ceph cluster
@@ -224,6 +476,14 @@ topics:
             description:
             requires:
               - overcloud-resource-registry-puppet.yaml
+      - title: Manage Firewall
+        description:
+        environments:
+          - file: environments/manage-firewall.yaml
+            title: Manage Firewall
+            description:
+            requires:
+              - overcloud-resource-registry-puppet.yaml
 
   - title: Operational Tools
     description: