Run nova-api hosts discovery after nova-compute start

[apex-tripleo-heat-templates.git] / environments / enable-tls.yaml

diff --git a/environments/enable-tls.yaml b/environments/enable-tls.yaml
index b4c3f08..39ded65 100644 (file)
--- a/environments/enable-tls.yaml
+++ b/environments/enable-tls.yaml
@@ -1,52 +1,12 @@
+# 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:
   SSLCertificate: |
     The contents of your certificate go here
   SSLIntermediateCertificate: ''
   SSLKey: |
     The contents of the private key go here
-  EndpointMap:
-    AodhAdmin: {protocol: 'http', port: '8042', host: 'IP_ADDRESS'}
-    AodhInternal: {protocol: 'http', port: '8042', host: 'IP_ADDRESS'}
-    AodhPublic: {protocol: 'https', port: '13042', host: 'CLOUDNAME'}
-    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'}
-    GlanceRegistryInternal: {protocol: 'http', port: '9191', host: 'IP_ADDRESS'}
-    GnocchiAdmin: {protocol: 'http', port: '8041', host: 'IP_ADDRESS'}
-    GnocchiInternal: {protocol: 'http', port: '8041', host: 'IP_ADDRESS'}
-    GnocchiPublic: {protocol: 'https', port: '13041', host: 'CLOUDNAME'}
-    HeatAdmin: {protocol: 'http', port: '8004', host: 'IP_ADDRESS'}
-    HeatInternal: {protocol: 'http', port: '8004', host: 'IP_ADDRESS'}
-    HeatPublic: {protocol: 'https', port: '13004', host: 'CLOUDNAME'}
-    HeatCfnAdmin: {protocol: 'http', port: '8000', host: 'IP_ADDRESS'}
-    HeatCfnInternal: {protocol: 'http', port: '8000', host: 'IP_ADDRESS'}
-    HeatCfnPublic: {protocol: 'https', port: '13005', 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'}
-    MysqlInternal: {protocol: 'mysql+pymysql', port: '3306', host: 'IP_ADDRESS'}
-    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'}
-    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: '13386', 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