Merge "Force epmd listening to a specific address"

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

diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml
index a17f1c9..8ce6248 100644 (file)
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -5007,14 +5007,14 @@ outputs:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NovaApiNetwork]
+                - get_param: [ServiceNetMap, NovaPlacementNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, NovaApiNetwork]
+                        get_param: [ServiceNetMap, NovaPlacementNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
@@ -5024,11 +5024,11 @@ outputs:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NovaApiNetwork]
+                - get_param: [ServiceNetMap, NovaPlacementNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, NovaApiNetwork]
+                - get_param: [ServiceNetMap, NovaPlacementNetwork]
         port:
           get_param: [EndpointMap, NovaPlacementAdmin, port]
         protocol:
@@ -5045,14 +5045,14 @@ outputs:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NovaApiNetwork]
+                    - get_param: [ServiceNetMap, NovaPlacementNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NovaApiNetwork]
+                            get_param: [ServiceNetMap, NovaPlacementNetwork]
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, NovaPlacementAdmin, port]
@@ -5069,18 +5069,17 @@ outputs:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NovaApiNetwork]
+                    - get_param: [ServiceNetMap, NovaPlacementNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NovaApiNetwork]
+                            get_param: [ServiceNetMap, NovaPlacementNetwork]
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, NovaPlacementAdmin, port]
-            - /placement
       NovaPlacementInternal:
         host:
           str_replace:
@@ -5090,14 +5089,14 @@ outputs:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NovaApiNetwork]
+                - get_param: [ServiceNetMap, NovaPlacementNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, NovaApiNetwork]
+                        get_param: [ServiceNetMap, NovaPlacementNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
@@ -5107,11 +5106,11 @@ outputs:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NovaApiNetwork]
+                - get_param: [ServiceNetMap, NovaPlacementNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, NovaApiNetwork]
+                - get_param: [ServiceNetMap, NovaPlacementNetwork]
         port:
           get_param: [EndpointMap, NovaPlacementInternal, port]
         protocol:
@@ -5128,14 +5127,14 @@ outputs:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NovaApiNetwork]
+                    - get_param: [ServiceNetMap, NovaPlacementNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NovaApiNetwork]
+                            get_param: [ServiceNetMap, NovaPlacementNetwork]
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, NovaPlacementInternal, port]
@@ -5152,18 +5151,17 @@ outputs:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NovaApiNetwork]
+                    - get_param: [ServiceNetMap, NovaPlacementNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NovaApiNetwork]
+                            get_param: [ServiceNetMap, NovaPlacementNetwork]
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, NovaPlacementInternal, port]
-            - /placement
       NovaPlacementPublic:
         host:
           str_replace:
@@ -5240,13 +5238,12 @@ outputs:
                     get_param:
                     - NetIpMap
                     - str_replace:
-                       params:
+                        params:
                           NETWORK:
                             get_param: [ServiceNetMap, PublicNetwork]
-                       template: NETWORK_uri
+                        template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, NovaPlacementPublic, port]
-            - /placement
       NovaVNCProxyAdmin:
         host:
           str_replace: