Update capabilities-map
* Remove docker.yaml from capabilities-map as its resource registry is already included in overcloud-resource-registry-puppet.j2.yaml * Add inject-trust-anchor.yaml to Security section * Remove unused docker-network.yaml reference Change-Id: Id637303a434f1fa6bff2a6d415ab56af4e067aa9
This commit is contained in:
parent
adcf0d7fe8
commit
0f6c13fc97
@ -37,21 +37,15 @@ topics:
|
||||
- file: overcloud-resource-registry-puppet.yaml
|
||||
title: Base resources configuration
|
||||
description:
|
||||
- title: Containerized Deployment
|
||||
- title: Containerized Deployment Configuration
|
||||
description: >
|
||||
Configures Deployment to use containerized services
|
||||
environments:
|
||||
- file: environments/docker.yaml
|
||||
title: Containerized Deployment
|
||||
description:
|
||||
requires:
|
||||
- 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
|
||||
description: Enables configuration of an Overcloud Controller with Pacemaker
|
||||
environments:
|
||||
@ -60,7 +54,6 @@ topics:
|
||||
description: Deploy the HA services via Docker
|
||||
requires:
|
||||
- overcloud-resource-registry-puppet.yaml
|
||||
- environments/docker.yaml
|
||||
mutually_exclusive: true
|
||||
|
||||
- title: Network Configuration
|
||||
@ -184,17 +177,6 @@ topics:
|
||||
- overcloud-resource-registry-puppet.yaml
|
||||
mutually_exclusive: true
|
||||
|
||||
- title: Docker Network
|
||||
description: >
|
||||
[Temporary] Use this option when deploying containerized deployment
|
||||
without network isolation
|
||||
environments:
|
||||
- file: environments/docker-network.yaml
|
||||
title: Docker network
|
||||
description:
|
||||
requires:
|
||||
- environments/docker.yaml
|
||||
|
||||
- title: External load balancer
|
||||
description: >
|
||||
Enable external load balancer, requires network Isolation to be enabled.
|
||||
@ -522,6 +504,17 @@ topics:
|
||||
requires:
|
||||
- environments/ssl/enable-tls.yaml
|
||||
mutually_exclusive: true
|
||||
- title: Inject SSL Trust Anchor
|
||||
description:
|
||||
environments:
|
||||
- file: environments/ssl/inject-trust-anchor.yaml
|
||||
title: Inject SSL Trust Anchor on Overcloud Nodes
|
||||
description: >
|
||||
When using an SSL certificate signed by a CA that is not in the default
|
||||
list of CAs, this option allows adding a custom CA certificate to
|
||||
the overcloud nodes.
|
||||
requires:
|
||||
- environments/ssl/enable-tls.yaml
|
||||
- title: SSH Banner Text
|
||||
description: Enables population of SSH Banner Text
|
||||
environments:
|
||||
|
Loading…
x
Reference in New Issue
Block a user