Merge "Remove tenant_id from nova v2.1 endpoint"

[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 bd4e228..5afcf5d 100644 (file)
--- a/network/endpoints/endpoint_data.yaml
+++ b/network/endpoints/endpoint_data.yaml
@@ -61,8 +61,16 @@ GlanceRegistry:
     port: 9191
 
 Mysql:
-    '':
+    Internal:
         vip_param: Mysql
+    protocol: mysql+pymysql
+    port: 3306
+
+MysqlNoBrackets:
+    Internal:
+        vip_param: MysqlNoBrackets
+    protocol: mysql+pymysql
+    port: 3306
 
 Heat:
     Internal:
@@ -79,6 +87,21 @@ Heat:
             '': /v1/%(tenant_id)s
     port: 8004
 
+HeatCfn:
+    Internal:
+        vip_param: HeatApi
+        uri_suffixes:
+            '': /v1
+    Public:
+        vip_param: Public
+        uri_suffixes:
+            '': /v1
+    Admin:
+        vip_param: HeatApi
+        uri_suffixes:
+            '': /v1
+    port: 8000
+
 Horizon:
     Public:
         vip_param: Public
@@ -123,32 +146,17 @@ Nova:
     Internal:
         vip_param: NovaApi
         uri_suffixes:
-            '': /v2.1/%(tenant_id)s
+            '': /v2.1
     Public:
         vip_param: Public
         uri_suffixes:
-            '': /v2.1/%(tenant_id)s
+            '': /v2.1
     Admin:
         vip_param: NovaApi
         uri_suffixes:
-            '': /v2.1/%(tenant_id)s
+            '': /v2.1
     port: 8774
 
-NovaEC2:
-    Internal:
-        vip_param: NovaApi
-        uri_suffixes:
-            '': /services/Cloud
-    Public:
-        vip_param: Public
-        uri_suffixes:
-            '': /services/Cloud
-    Admin:
-        vip_param: NovaApi
-        uri_suffixes:
-            '': /services/Admin
-    port: 8773
-
 NovaVNCProxy:
     Internal:
         vip_param: NovaApi
@@ -182,7 +190,7 @@ Sahara:
         uri_suffixes:
             '': /v1.1/%(tenant_id)s
     Public:
-        vip_param: SaharaApi
+        vip_param: Public
         uri_suffixes:
             '': /v1.1/%(tenant_id)s
     Admin:
@@ -190,3 +198,18 @@ Sahara:
         uri_suffixes:
             '': /v1.1/%(tenant_id)s
     port: 8386
+
+Ironic:
+    Internal:
+        vip_param: IronicApi
+        uri_suffixes:
+            '': /v1
+    Public:
+        vip_param: Public
+        uri_suffixes:
+            '': /v1
+    Admin:
+        vip_param: IronicApi
+        uri_suffixes:
+            '': /v1
+    port: 6385