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

diff --git a/environments/enable-tls.yaml b/environments/enable-tls.yaml
index a3f39eb..39ded65 100644 (file)
--- a/environments/enable-tls.yaml
+++ b/environments/enable-tls.yaml
@@ -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

diff --git a/environments/tls-endpoints-public-dns.yaml b/environments/tls-endpoints-public-dns.yaml
index 3629672..7c8e850 100644 (file)
--- 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

diff --git a/environments/tls-endpoints-public-ip.yaml b/environments/tls-endpoints-public-ip.yaml
index d3f07cd..80595c6 100644 (file)
--- 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