Replace no-op TLS stacks with OS::Heat::None
These stacks effectively do nothing. So better replace them with the None resource. Change-Id: If1fc759ca7f03f66229c27560cc4b8e10baa0f11
This commit is contained in:
parent
f89de8512b
commit
20c1b992be
@ -38,8 +38,8 @@ resource_registry:
|
||||
# NodeExtraConfig == All nodes configuration pre service deployment
|
||||
# NodeExtraConfigPost == All nodes configuration post service deployment
|
||||
OS::TripleO::NodeUserData: firstboot/userdata_default.yaml
|
||||
OS::TripleO::NodeTLSCAData: puppet/extraconfig/tls/no-ca.yaml
|
||||
OS::TripleO::NodeTLSData: puppet/extraconfig/tls/no-tls.yaml
|
||||
OS::TripleO::NodeTLSCAData: OS::Heat::None
|
||||
OS::TripleO::NodeTLSData: OS::Heat::None
|
||||
OS::TripleO::ControllerExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
|
||||
OS::TripleO::ComputeExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
|
||||
OS::TripleO::CephStorageExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
|
||||
|
@ -1,17 +0,0 @@
|
||||
heat_template_version: 2015-04-30
|
||||
|
||||
description: >
|
||||
This is a default no-op template which can be passed to the
|
||||
OS::Nova::Server resources. This template can be replaced with
|
||||
a different implementation via the resource registry, such that
|
||||
deployers may customize their configuration.
|
||||
|
||||
parameters:
|
||||
server: # Here for compatibility with controller.yaml
|
||||
description: ID of the controller node to apply this config to
|
||||
type: string
|
||||
|
||||
outputs:
|
||||
deploy_stdout:
|
||||
description: Deployment reference, used to trigger puppet apply on changes
|
||||
value: 'Root CA cert injection not enabled.'
|
@ -1,34 +0,0 @@
|
||||
heat_template_version: 2015-04-30
|
||||
|
||||
description: >
|
||||
This is a default no-op template. This defines the parameters that
|
||||
need to be passed in order to have TLS enabled in the controller
|
||||
nodes. This template can be replaced with a different
|
||||
implementation via the resource registry, such that deployers
|
||||
may customize their configuration.
|
||||
|
||||
parameters:
|
||||
DeployedSSLCertificatePath:
|
||||
default: ''
|
||||
description: >
|
||||
The filepath of the certificate as it will be stored in the controller.
|
||||
type: string
|
||||
NodeIndex: # Here for compatibility with puppet/controller.yaml
|
||||
default: 0
|
||||
type: number
|
||||
server: # Here for compatibility with puppet/controller.yaml
|
||||
description: ID of the controller node to apply this config to
|
||||
type: string
|
||||
|
||||
outputs:
|
||||
deploy_stdout:
|
||||
description: Deployment reference, used to trigger puppet apply on changes
|
||||
value: 'TLS not enabled.'
|
||||
deployed_ssl_certificate_path:
|
||||
value: ''
|
||||
key_modulus_md5:
|
||||
description: Key SSL Modulus
|
||||
value: ''
|
||||
cert_modulus_md5:
|
||||
description: Certificate SSL Modulus
|
||||
value: ''
|
Loading…
x
Reference in New Issue
Block a user