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 c76e136..5afcf5d 100644 (file)
--- a/network/endpoints/endpoint_data.yaml
+++ b/network/endpoints/endpoint_data.yaml
@@ -66,6 +66,12 @@ Mysql:
     protocol: mysql+pymysql
     port: 3306
 
+MysqlNoBrackets:
+    Internal:
+        vip_param: MysqlNoBrackets
+    protocol: mysql+pymysql
+    port: 3306
+
 Heat:
     Internal:
         vip_param: HeatApi
@@ -140,15 +146,15 @@ 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
 
 NovaVNCProxy:
@@ -192,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