Merge "Move resource registry override to enable-tls.yaml"
This commit is contained in:
commit
2903a9e4cd
|
@ -7,3 +7,6 @@ parameter_defaults:
|
|||
SSLIntermediateCertificate: ''
|
||||
SSLKey: |
|
||||
The contents of the private key go here
|
||||
|
||||
resource_registry:
|
||||
OS::TripleO::NodeTLSData: ../puppet/extraconfig/tls/tls-cert-inject.yaml
|
||||
|
|
|
@ -50,6 +50,3 @@ parameter_defaults:
|
|||
SwiftAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
|
||||
SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
|
||||
SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'}
|
||||
|
||||
resource_registry:
|
||||
OS::TripleO::NodeTLSData: ../puppet/extraconfig/tls/tls-cert-inject.yaml
|
||||
|
|
|
@ -50,6 +50,3 @@ parameter_defaults:
|
|||
SwiftAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
|
||||
SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
|
||||
SwiftPublic: {protocol: 'https', port: '13808', host: 'IP_ADDRESS'}
|
||||
|
||||
resource_registry:
|
||||
OS::TripleO::NodeTLSData: ../puppet/extraconfig/tls/tls-cert-inject.yaml
|
||||
|
|
Loading…
Reference in New Issue