From b31116a71264beae513ac3bb0ecead95f9e6506f Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Tue, 23 Aug 2016 08:53:50 +0300 Subject: Move resource registry override to enable-tls.yaml It makes more sense for the enable-tls.yaml file to contain the resource registry override, since it contains parameters that are actually used there. Also, this allows us to reuse the tls-endpoints-public-* files for other methods of enabling TLS (such as with certmonger). Change-Id: I98c63d0007e61968c0490a474eddb42548891fa6 --- environments/tls-endpoints-public-ip.yaml | 3 --- 1 file changed, 3 deletions(-) (limited to 'environments/tls-endpoints-public-ip.yaml') diff --git a/environments/tls-endpoints-public-ip.yaml b/environments/tls-endpoints-public-ip.yaml index d3f07cda..80595c6c 100644 --- a/environments/tls-endpoints-public-ip.yaml +++ b/environments/tls-endpoints-public-ip.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 -- cgit 1.2.3-korg