Merge "Remove calls to ::mysql from the manifests"

[apex-tripleo-heat-templates.git] / network / endpoints / endpoint_data.yaml

diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml
index 9d508d1..f88a68f 100644 (file)
--- a/network/endpoints/endpoint_data.yaml
+++ b/network/endpoints/endpoint_data.yaml
@@ -1,6 +1,15 @@
 # Data in this file is used to generate the endpoint_map.yaml template.
 # Run the script build_endpoint_map.py to regenerate the file.
 
+Aodh:
+    Internal:
+        vip_param: AodhApi
+    Public:
+        vip_param: Public
+    Admin:
+        vip_param: AodhApi
+    port: 8042
+
 Ceilometer:
     Internal:
         vip_param: CeilometerApi
@@ -10,6 +19,15 @@ Ceilometer:
         vip_param: CeilometerApi
     port: 8777
 
+Gnocchi:
+    Internal:
+        vip_param: GnocchiApi
+    Public:
+        vip_param: Public
+    Admin:
+        vip_param: GnocchiApi
+    port: 8041
+
 Cinder:
     Internal:
         vip_param: CinderApi
@@ -40,10 +58,6 @@ Glance:
 GlanceRegistry:
     Internal:
         vip_param: GlanceRegistry
-    Public:
-        vip_param: Public
-    Admin:
-        vip_param: GlanceRegistry
     port: 9191
 
 Mysql:
@@ -72,40 +86,27 @@ Horizon:
             '': /dashboard
     port: 80
 
+# TODO(ayoung): V3 is a temporary fix. Endpoints should be versionless.
+# Required for https://bugs.launchpad.net/puppet-nova/+bug/1542486
 Keystone:
     Internal:
         vip_param: KeystonePublicApi
         uri_suffixes:
             '': /v2.0
             EC2: /v2.0/ec2tokens
+            V3: /v3
         names:
             EC2: KeystoneEC2
     Public:
         vip_param: Public
         uri_suffixes:
             '': /v2.0
+            V3: /v3
     Admin:
         vip_param: KeystoneAdminApi
         uri_suffixes:
             '': /v2.0
-        port: 35357
-    port: 5000
-
-# TODO(ayoung): V3 is a temporary fix. Endpoints should be versionless.
-# Required for https://bugs.launchpad.net/puppet-nova/+bug/1542486
-KeystoneV3:
-    Internal:
-        vip_param: KeystonePublicApi
-        uri_suffixes:
-            '': /v3
-    Public:
-        vip_param: Public
-        uri_suffixes:
-            '': /v3
-    Admin:
-        vip_param: KeystoneAdminApi
-        uri_suffixes:
-            '': /v3
+            V3: /v3
         port: 35357
     port: 5000
 
@@ -122,18 +123,15 @@ Nova:
     Internal:
         vip_param: NovaApi
         uri_suffixes:
-            '': /v2/%(tenant_id)s
-            V3: /v3
+            '': /v2.1/%(tenant_id)s
     Public:
         vip_param: Public
         uri_suffixes:
-            '': /v2/%(tenant_id)s
-            V3: /v3
+            '': /v2.1/%(tenant_id)s
     Admin:
         vip_param: NovaApi
         uri_suffixes:
-            '': /v2/%(tenant_id)s
-            V3: /v3
+            '': /v2.1/%(tenant_id)s
     port: 8774
 
 NovaEC2:
@@ -184,7 +182,7 @@ Sahara:
         uri_suffixes:
             '': /v1.1/%(tenant_id)s
     Public:
-        vip_param: SaharaApi
+        vip_param: Public
         uri_suffixes:
             '': /v1.1/%(tenant_id)s
     Admin: