1 files changed, 7 insertions, 6 deletions
diff --git a/environments/enable-tls.yaml b/environments/enable-tls.yaml
index d6328c06..e708688f 100644
--- a/environments/enable-tls.yaml
+++ b/environments/enable-tls.yaml
@@ -5,6 +5,9 @@ parameter_defaults:
   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'}
@@ -14,9 +17,10 @@ parameter_defaults:
     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.
+    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'}
@@ -24,9 +28,6 @@ parameter_defaults:
     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'}
@@ -41,7 +42,7 @@ parameter_defaults:
     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'}
+    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'}