Merge "Fix service config files having wrong map_merge format"

[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 f88a68f..84b03c7 100644 (file)
--- a/network/endpoints/endpoint_data.yaml
+++ b/network/endpoints/endpoint_data.yaml
@@ -3,85 +3,105 @@
 
 Aodh:
     Internal:
-        vip_param: AodhApi
+        net_param: AodhApi
     Public:
-        vip_param: Public
+        net_param: Public
     Admin:
-        vip_param: AodhApi
+        net_param: AodhApi
     port: 8042
 
 Ceilometer:
     Internal:
-        vip_param: CeilometerApi
+        net_param: CeilometerApi
     Public:
-        vip_param: Public
+        net_param: Public
     Admin:
-        vip_param: CeilometerApi
+        net_param: CeilometerApi
     port: 8777
 
 Gnocchi:
     Internal:
-        vip_param: GnocchiApi
+        net_param: GnocchiApi
     Public:
-        vip_param: Public
+        net_param: Public
     Admin:
-        vip_param: GnocchiApi
+        net_param: GnocchiApi
     port: 8041
 
 Cinder:
     Internal:
-        vip_param: CinderApi
+        net_param: CinderApi
         uri_suffixes:
             '': /v1/%(tenant_id)s
             V2: /v2/%(tenant_id)s
+            V3: /v3/%(tenant_id)s
     Public:
-        vip_param: Public
+        net_param: Public
         uri_suffixes:
             '': /v1/%(tenant_id)s
             V2: /v2/%(tenant_id)s
+            V3: /v3/%(tenant_id)s
     Admin:
-        vip_param: CinderApi
+        net_param: CinderApi
         uri_suffixes:
             '': /v1/%(tenant_id)s
             V2: /v2/%(tenant_id)s
+            V3: /v3/%(tenant_id)s
     port: 8776
 
 Glance:
     Internal:
-        vip_param: GlanceApi
+        net_param: GlanceApi
     Public:
-        vip_param: Public
+        net_param: Public
     Admin:
-        vip_param: GlanceApi
+        net_param: GlanceApi
     port: 9292
 
 GlanceRegistry:
     Internal:
-        vip_param: GlanceRegistry
+        net_param: GlanceRegistry
     port: 9191
 
 Mysql:
-    '':
-        vip_param: Mysql
+    Internal:
+        net_param: Mysql
+    protocol: mysql+pymysql
+    port: 3306
 
 Heat:
     Internal:
-        vip_param: HeatApi
+        net_param: HeatApi
         uri_suffixes:
             '': /v1/%(tenant_id)s
     Public:
-        vip_param: Public
+        net_param: Public
         uri_suffixes:
             '': /v1/%(tenant_id)s
     Admin:
-        vip_param: HeatApi
+        net_param: HeatApi
         uri_suffixes:
             '': /v1/%(tenant_id)s
     port: 8004
 
+HeatCfn:
+    Internal:
+        net_param: HeatApi
+        uri_suffixes:
+            '': /v1
+    Public:
+        net_param: Public
+        uri_suffixes:
+            '': /v1
+    Admin:
+        net_param: HeatApi
+        uri_suffixes:
+            '': /v1
+    port: 8000
+
 Horizon:
     Public:
-        vip_param: Public
+        net_param: Public
         uri_suffixes:
             '': /dashboard
     port: 80
@@ -90,7 +110,7 @@ Horizon:
 # Required for https://bugs.launchpad.net/puppet-nova/+bug/1542486
 Keystone:
     Internal:
-        vip_param: KeystonePublicApi
+        net_param: KeystonePublicApi
         uri_suffixes:
             '': /v2.0
             EC2: /v2.0/ec2tokens
@@ -98,79 +118,82 @@ Keystone:
         names:
             EC2: KeystoneEC2
     Public:
-        vip_param: Public
+        net_param: Public
         uri_suffixes:
             '': /v2.0
             V3: /v3
     Admin:
-        vip_param: KeystoneAdminApi
+        net_param: KeystoneAdminApi
         uri_suffixes:
             '': /v2.0
             V3: /v3
         port: 35357
     port: 5000
 
-Neutron:
+Manila:
     Internal:
-        vip_param: NeutronApi
+        net_param: ManilaApi
+        uri_suffixes:
+            '': /v2/%(tenant_id)s
+            V1: /v1/%(tenant_id)s
     Public:
-        vip_param: Public
+        net_param: Public
+        uri_suffixes:
+            '': /v2/%(tenant_id)s
+            V1: /v1/%(tenant_id)s
     Admin:
-        vip_param: NeutronApi
-    port: 9696
+        net_param: ManilaApi
+        uri_suffixes:
+            '': /v2/%(tenant_id)s
+            V1: /v1/%(tenant_id)s
+    port: 8786
 
-Nova:
+Neutron:
     Internal:
-        vip_param: NovaApi
-        uri_suffixes:
-            '': /v2.1/%(tenant_id)s
+        net_param: NeutronApi
     Public:
-        vip_param: Public
-        uri_suffixes:
-            '': /v2.1/%(tenant_id)s
+        net_param: Public
     Admin:
-        vip_param: NovaApi
-        uri_suffixes:
-            '': /v2.1/%(tenant_id)s
-    port: 8774
+        net_param: NeutronApi
+    port: 9696
 
-NovaEC2:
+Nova:
     Internal:
-        vip_param: NovaApi
+        net_param: NovaApi
         uri_suffixes:
-            '': /services/Cloud
+            '': /v2.1
     Public:
-        vip_param: Public
+        net_param: Public
         uri_suffixes:
-            '': /services/Cloud
+            '': /v2.1
     Admin:
-        vip_param: NovaApi
+        net_param: NovaApi
         uri_suffixes:
-            '': /services/Admin
-    port: 8773
+            '': /v2.1
+    port: 8774
 
 NovaVNCProxy:
     Internal:
-        vip_param: NovaApi
+        net_param: NovaApi
     Public:
-        vip_param: Public
+        net_param: Public
     Admin:
-        vip_param: NovaApi
+        net_param: NovaApi
     port: 6080
 
 Swift:
     Internal:
-        vip_param: SwiftProxy
+        net_param: SwiftProxy
         uri_suffixes:
             '': /v1/AUTH_%(tenant_id)s
             S3:
     Public:
-        vip_param: Public
+        net_param: Public
         uri_suffixes:
             '': /v1/AUTH_%(tenant_id)s
             S3:
     Admin:
-        vip_param: SwiftProxy
+        net_param: SwiftProxy
         uri_suffixes:
             '':
             S3:
@@ -178,15 +201,30 @@ Swift:
 
 Sahara:
     Internal:
-        vip_param: SaharaApi
+        net_param: SaharaApi
         uri_suffixes:
             '': /v1.1/%(tenant_id)s
     Public:
-        vip_param: Public
+        net_param: Public
         uri_suffixes:
             '': /v1.1/%(tenant_id)s
     Admin:
-        vip_param: SaharaApi
+        net_param: SaharaApi
         uri_suffixes:
             '': /v1.1/%(tenant_id)s
     port: 8386
+
+Ironic:
+    Internal:
+        net_param: IronicApi
+        uri_suffixes:
+            '': /v1
+    Public:
+        net_param: Public
+        uri_suffixes:
+            '': /v1
+    Admin:
+        net_param: IronicApi
+        uri_suffixes:
+            '': /v1
+    port: 6385