diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-25 06:11:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-25 06:11:04 +0000 |
| commit | 2903a9e4cdb55628ecdd76557e9c7814827d04ab (patch) | |
| tree | 632be2cb3edfba6a3b32899d37b2e36a2f44cf62 /environments/tls-endpoints-public-dns.yaml | |
| parent | 6d12839f3655f8774ad227bfa4f3cf4d7b45acc5 (diff) | |
| parent | b31116a71264beae513ac3bb0ecead95f9e6506f (diff) | |
Merge "Move resource registry override to enable-tls.yaml"
Diffstat (limited to 'environments/tls-endpoints-public-dns.yaml')
| -rw-r--r-- | environments/tls-endpoints-public-dns.yaml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/environments/tls-endpoints-public-dns.yaml b/environments/tls-endpoints-public-dns.yaml index 3629672a..7c8e850c 100644 --- a/environments/tls-endpoints-public-dns.yaml +++ b/environments/tls-endpoints-public-dns.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 |