X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fenable-tls.yaml;h=175e1fd7e9ee14953332378cb518aed3b26857d4;hb=43c38f36f6e7a5c988c120813ccb9acdff56c9d8;hp=d6328c062586ac599032b5b8442454beee859b1c;hpb=5610ecf80c09edec00b2076d3ad35286254f2028;p=apex-tripleo-heat-templates.git

diff --git a/environments/enable-tls.yaml b/environments/enable-tls.yaml
index d6328c06..175e1fd7 100644
--- a/environments/enable-tls.yaml
+++ b/environments/enable-tls.yaml
@@ -1,50 +1,16 @@
+# ********************************************************************************
+# DEPRECATED: Use tripleo-heat-templates/environments/ssl/enable-tls.yaml instead.
+# ********************************************************************************
+# Use this environment to pass in certificates for SSL deployments.
+# For these values to take effect, one of the tls-endpoints-*.yaml environments
+# must also be used.
 parameter_defaults:
+  HorizonSecureCookies: True
   SSLCertificate: |
     The contents of your certificate go here
   SSLIntermediateCertificate: ''
   SSLKey: |
     The contents of the private key go here
-  EndpointMap:
-    CeilometerAdmin: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'}
-    CeilometerInternal: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'}
-    CeilometerPublic: {protocol: 'https', port: '13777', host: 'CLOUDNAME'}
-    CinderAdmin: {protocol: 'http', port: '8776', host: 'IP_ADDRESS'}
-    CinderInternal: {protocol: 'http', port: '8776', host: 'IP_ADDRESS'}
-    CinderPublic: {protocol: 'https', port: '13776', host: 'CLOUDNAME'}
-    GlanceAdmin: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
-    GlanceInternal: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
-    GlancePublic: {protocol: 'https', port: '13292', host: 'CLOUDNAME'}
-    GlanceRegistryAdmin: {protocol: 'http', port: '9191', host: 'IP_ADDRESS'}
-    GlanceRegistryInternal: {protocol: 'http', port: '9191', host: 'IP_ADDRESS'}
-    GlanceRegistryPublic: {protocol: 'https', port: '9191', host: 'IP_ADDRESS'} # Not set on the loadbalancer yet.
-    HeatAdmin: {protocol: 'http', port: '8004', host: 'IP_ADDRESS'}
-    HeatInternal: {protocol: 'http', port: '8004', host: 'IP_ADDRESS'}
-    HeatPublic: {protocol: 'https', port: '13004', host: 'CLOUDNAME'}
-    HorizonPublic: {protocol: 'https', port: '443', host: 'CLOUDNAME'}
-    KeystoneAdmin: {protocol: 'http', port: '35357', host: 'IP_ADDRESS'}
-    KeystoneInternal: {protocol: 'http', port: '5000', host: 'IP_ADDRESS'}
-    KeystonePublic: {protocol: 'https', port: '13000', host: 'CLOUDNAME'}
-    KeystoneV3Admin: {protocol: 'http', port: '35357', host: 'IP_ADDRESS'}
-    KeystoneV3Internal: {protocol: 'http', port: '5000', host: 'IP_ADDRESS'}
-    KeystoneV3Public: {protocol: 'https', port: '13000', host: 'CLOUDNAME'}
-    NeutronAdmin: {protocol: 'http', port: '9696', host: 'IP_ADDRESS'}
-    NeutronInternal: {protocol: 'http', port: '9696', host: 'IP_ADDRESS'}
-    NeutronPublic: {protocol: 'https', port: '13696', host: 'CLOUDNAME'}
-    NovaAdmin: {protocol: 'http', port: '8774', host: 'IP_ADDRESS'}
-    NovaInternal: {protocol: 'http', port: '8774', host: 'IP_ADDRESS'}
-    NovaPublic: {protocol: 'https', port: '13774', host: 'CLOUDNAME'}
-    NovaEC2Admin: {protocol: 'http', port: '8773', host: 'IP_ADDRESS'}
-    NovaEC2Internal: {protocol: 'http', port: '8773', host: 'IP_ADDRESS'}
-    NovaEC2Public: {protocol: 'https', port: '13773', host: 'CLOUDNAME'}
-    NovaVNCProxyAdmin: {protocol: 'http', port: '6080', host: 'IP_ADDRESS'}
-    NovaVNCProxyInternal: {protocol: 'http', port: '6080', host: 'IP_ADDRESS'}
-    NovaVNCProxyPublic: {protocol: 'https', port: '13080', host: 'CLOUDNAME'}
-    SaharaAdmin: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
-    SaharaInternal: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
-    SaharaPublic: {protocol: 'https', port: '13786', host: 'CLOUDNAME'}
-    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