Merge "Enable internal TLS for gnocchi"

[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 d055311..43fb20c 100644 (file)
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -22,9 +22,15 @@ parameters:
       AodhAdmin: {protocol: http, port: '8042', host: IP_ADDRESS}
       AodhInternal: {protocol: http, port: '8042', host: IP_ADDRESS}
       AodhPublic: {protocol: http, port: '8042', host: IP_ADDRESS}
+      BarbicanAdmin: {protocol: http, port: '9311', host: IP_ADDRESS}
+      BarbicanInternal: {protocol: http, port: '9311', host: IP_ADDRESS}
+      BarbicanPublic: {protocol: http, port: '9311', host: IP_ADDRESS}
       CeilometerAdmin: {protocol: http, port: '8777', host: IP_ADDRESS}
       CeilometerInternal: {protocol: http, port: '8777', host: IP_ADDRESS}
       CeilometerPublic: {protocol: http, port: '8777', host: IP_ADDRESS}
+      CephRgwAdmin: {protocol: http, port: '8080', host: IP_ADDRESS}
+      CephRgwInternal: {protocol: http, port: '8080', host: IP_ADDRESS}
+      CephRgwPublic: {protocol: http, port: '8080', host: IP_ADDRESS}
       CinderAdmin: {protocol: http, port: '8776', host: IP_ADDRESS}
       CinderInternal: {protocol: http, port: '8776', host: IP_ADDRESS}
       CinderPublic: {protocol: http, port: '8776', host: IP_ADDRESS}
@@ -51,6 +57,9 @@ parameters:
       ManilaAdmin: {protocol: http, port: '8786', host: IP_ADDRESS}
       ManilaInternal: {protocol: http, port: '8786', host: IP_ADDRESS}
       ManilaPublic: {protocol: http, port: '8786', host: IP_ADDRESS}
+      MistralAdmin: {protocol: http, port: '8989', host: IP_ADDRESS}
+      MistralInternal: {protocol: http, port: '8989', host: IP_ADDRESS}
+      MistralPublic: {protocol: http, port: '8989', host: IP_ADDRESS}
       MysqlInternal: {protocol: mysql+pymysql, port: '3306', host: IP_ADDRESS}
       NeutronAdmin: {protocol: http, port: '9696', host: IP_ADDRESS}
       NeutronInternal: {protocol: http, port: '9696', host: IP_ADDRESS}
@@ -69,8 +78,11 @@ parameters:
       SwiftPublic: {protocol: http, port: '8080', host: IP_ADDRESS}
     description: Mapping of service endpoint -> protocol. Typically set
       via parameter_defaults in the resource registry.
-  CloudName: {type: string, default: overcloud, description: The DNS name
-      of this cloud. e.g. ci-overcloud.tripleo.org}
+  CloudEndpoints:
+    type: json
+    default: {}
+    description: A map containing the DNS names for the different endpoints
+      (external, internal_api, etc.)
 outputs:
   endpoint_map:
     value:
@@ -80,7 +92,10 @@ outputs:
             template:
               get_param: [EndpointMap, AodhAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, AodhApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -94,7 +109,10 @@ outputs:
             template:
               get_param: [EndpointMap, AodhAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, AodhApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -112,7 +130,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, AodhAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, AodhApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -132,7 +153,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, AodhAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, AodhApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -149,7 +173,10 @@ outputs:
             template:
               get_param: [EndpointMap, AodhInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, AodhApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -163,7 +190,10 @@ outputs:
             template:
               get_param: [EndpointMap, AodhInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, AodhApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -181,7 +211,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, AodhInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, AodhApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -201,7 +234,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, AodhInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, AodhApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -218,7 +254,10 @@ outputs:
             template:
               get_param: [EndpointMap, AodhPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -232,7 +271,10 @@ outputs:
             template:
               get_param: [EndpointMap, AodhPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -250,7 +292,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, AodhPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -270,7 +315,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, AodhPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -281,151 +329,178 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, AodhPublic, port]
-      CeilometerAdmin:
+      BarbicanAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, CeilometerAdmin, host]
+              get_param: [EndpointMap, BarbicanAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, BarbicanApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, CeilometerApiNetwork]
+                        get_param: [ServiceNetMap, BarbicanApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, CeilometerAdmin, host]
+              get_param: [EndpointMap, BarbicanAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, BarbicanApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, CeilometerApiNetwork]
+                - get_param: [ServiceNetMap, BarbicanApiNetwork]
         port:
-          get_param: [EndpointMap, CeilometerAdmin, port]
+          get_param: [EndpointMap, BarbicanAdmin, port]
         protocol:
-          get_param: [EndpointMap, CeilometerAdmin, protocol]
+          get_param: [EndpointMap, BarbicanAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, CeilometerAdmin, protocol]
+          - - get_param: [EndpointMap, BarbicanAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, CeilometerAdmin, host]
+                  get_param: [EndpointMap, BarbicanAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, BarbicanApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, CeilometerApiNetwork]
+                            get_param: [ServiceNetMap, BarbicanApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CeilometerAdmin, port]
+            - get_param: [EndpointMap, BarbicanAdmin, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, CeilometerAdmin, protocol]
+          - - get_param: [EndpointMap, BarbicanAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, CeilometerAdmin, host]
+                  get_param: [EndpointMap, BarbicanAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, BarbicanApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, CeilometerApiNetwork]
+                            get_param: [ServiceNetMap, BarbicanApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CeilometerAdmin, port]
-      CeilometerInternal:
+            - get_param: [EndpointMap, BarbicanAdmin, port]
+      BarbicanInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, CeilometerInternal, host]
+              get_param: [EndpointMap, BarbicanInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, BarbicanApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, CeilometerApiNetwork]
+                        get_param: [ServiceNetMap, BarbicanApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, CeilometerInternal, host]
+              get_param: [EndpointMap, BarbicanInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, BarbicanApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, CeilometerApiNetwork]
+                - get_param: [ServiceNetMap, BarbicanApiNetwork]
         port:
-          get_param: [EndpointMap, CeilometerInternal, port]
+          get_param: [EndpointMap, BarbicanInternal, port]
         protocol:
-          get_param: [EndpointMap, CeilometerInternal, protocol]
+          get_param: [EndpointMap, BarbicanInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, CeilometerInternal, protocol]
+          - - get_param: [EndpointMap, BarbicanInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, CeilometerInternal, host]
+                  get_param: [EndpointMap, BarbicanInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, BarbicanApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, CeilometerApiNetwork]
+                            get_param: [ServiceNetMap, BarbicanApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CeilometerInternal, port]
+            - get_param: [EndpointMap, BarbicanInternal, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, CeilometerInternal, protocol]
+          - - get_param: [EndpointMap, BarbicanInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, CeilometerInternal, host]
+                  get_param: [EndpointMap, BarbicanInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, BarbicanApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, CeilometerApiNetwork]
+                            get_param: [ServiceNetMap, BarbicanApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CeilometerInternal, port]
-      CeilometerPublic:
+            - get_param: [EndpointMap, BarbicanInternal, port]
+      BarbicanPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, CeilometerPublic, host]
+              get_param: [EndpointMap, BarbicanPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -437,27 +512,33 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, CeilometerPublic, host]
+              get_param: [EndpointMap, BarbicanPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, CeilometerPublic, port]
+          get_param: [EndpointMap, BarbicanPublic, port]
         protocol:
-          get_param: [EndpointMap, CeilometerPublic, protocol]
+          get_param: [EndpointMap, BarbicanPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, CeilometerPublic, protocol]
+          - - get_param: [EndpointMap, BarbicanPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, CeilometerPublic, host]
+                  get_param: [EndpointMap, BarbicanPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -467,17 +548,20 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CeilometerPublic, port]
+            - get_param: [EndpointMap, BarbicanPublic, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, CeilometerPublic, protocol]
+          - - get_param: [EndpointMap, BarbicanPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, CeilometerPublic, host]
+                  get_param: [EndpointMap, BarbicanPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -487,154 +571,179 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CeilometerPublic, port]
-      CinderAdmin:
+            - get_param: [EndpointMap, BarbicanPublic, port]
+      CeilometerAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, CinderAdmin, host]
+              get_param: [EndpointMap, CeilometerAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CeilometerApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, CinderApiNetwork]
+                        get_param: [ServiceNetMap, CeilometerApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, CinderAdmin, host]
+              get_param: [EndpointMap, CeilometerAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CeilometerApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, CinderApiNetwork]
+                - get_param: [ServiceNetMap, CeilometerApiNetwork]
         port:
-          get_param: [EndpointMap, CinderAdmin, port]
+          get_param: [EndpointMap, CeilometerAdmin, port]
         protocol:
-          get_param: [EndpointMap, CinderAdmin, protocol]
+          get_param: [EndpointMap, CeilometerAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, CinderAdmin, protocol]
+          - - get_param: [EndpointMap, CeilometerAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, CinderAdmin, host]
+                  get_param: [EndpointMap, CeilometerAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CeilometerApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, CinderApiNetwork]
+                            get_param: [ServiceNetMap, CeilometerApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CinderAdmin, port]
-            - /v1/%(tenant_id)s
+            - get_param: [EndpointMap, CeilometerAdmin, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, CinderAdmin, protocol]
+          - - get_param: [EndpointMap, CeilometerAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, CinderAdmin, host]
+                  get_param: [EndpointMap, CeilometerAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CeilometerApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, CinderApiNetwork]
+                            get_param: [ServiceNetMap, CeilometerApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CinderAdmin, port]
-      CinderInternal:
+            - get_param: [EndpointMap, CeilometerAdmin, port]
+      CeilometerInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, CinderInternal, host]
+              get_param: [EndpointMap, CeilometerInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CeilometerApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, CinderApiNetwork]
+                        get_param: [ServiceNetMap, CeilometerApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, CinderInternal, host]
+              get_param: [EndpointMap, CeilometerInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CeilometerApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, CinderApiNetwork]
+                - get_param: [ServiceNetMap, CeilometerApiNetwork]
         port:
-          get_param: [EndpointMap, CinderInternal, port]
+          get_param: [EndpointMap, CeilometerInternal, port]
         protocol:
-          get_param: [EndpointMap, CinderInternal, protocol]
+          get_param: [EndpointMap, CeilometerInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, CinderInternal, protocol]
+          - - get_param: [EndpointMap, CeilometerInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, CinderInternal, host]
+                  get_param: [EndpointMap, CeilometerInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CeilometerApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, CinderApiNetwork]
+                            get_param: [ServiceNetMap, CeilometerApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CinderInternal, port]
-            - /v1/%(tenant_id)s
+            - get_param: [EndpointMap, CeilometerInternal, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, CinderInternal, protocol]
+          - - get_param: [EndpointMap, CeilometerInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, CinderInternal, host]
+                  get_param: [EndpointMap, CeilometerInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CeilometerApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, CinderApiNetwork]
+                            get_param: [ServiceNetMap, CeilometerApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CinderInternal, port]
-      CinderPublic:
+            - get_param: [EndpointMap, CeilometerInternal, port]
+      CeilometerPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, CinderPublic, host]
+              get_param: [EndpointMap, CeilometerPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -646,27 +755,33 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, CinderPublic, host]
+              get_param: [EndpointMap, CeilometerPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, CinderPublic, port]
+          get_param: [EndpointMap, CeilometerPublic, port]
         protocol:
-          get_param: [EndpointMap, CinderPublic, protocol]
+          get_param: [EndpointMap, CeilometerPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, CinderPublic, protocol]
+          - - get_param: [EndpointMap, CeilometerPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, CinderPublic, host]
+                  get_param: [EndpointMap, CeilometerPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -676,18 +791,20 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CinderPublic, port]
-            - /v1/%(tenant_id)s
+            - get_param: [EndpointMap, CeilometerPublic, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, CinderPublic, protocol]
+          - - get_param: [EndpointMap, CeilometerPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, CinderPublic, host]
+                  get_param: [EndpointMap, CeilometerPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -697,154 +814,181 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CinderPublic, port]
-      CinderV2Admin:
+            - get_param: [EndpointMap, CeilometerPublic, port]
+      CephRgwAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, CinderAdmin, host]
+              get_param: [EndpointMap, CephRgwAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CephRgwNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, CinderApiNetwork]
+                        get_param: [ServiceNetMap, CephRgwNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, CinderAdmin, host]
+              get_param: [EndpointMap, CephRgwAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CephRgwNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, CinderApiNetwork]
+                - get_param: [ServiceNetMap, CephRgwNetwork]
         port:
-          get_param: [EndpointMap, CinderAdmin, port]
+          get_param: [EndpointMap, CephRgwAdmin, port]
         protocol:
-          get_param: [EndpointMap, CinderAdmin, protocol]
+          get_param: [EndpointMap, CephRgwAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, CinderAdmin, protocol]
+          - - get_param: [EndpointMap, CephRgwAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, CinderAdmin, host]
+                  get_param: [EndpointMap, CephRgwAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CephRgwNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, CinderApiNetwork]
+                            get_param: [ServiceNetMap, CephRgwNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CinderAdmin, port]
-            - /v2/%(tenant_id)s
+            - get_param: [EndpointMap, CephRgwAdmin, port]
+            - /swift/v1
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, CinderAdmin, protocol]
+          - - get_param: [EndpointMap, CephRgwAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, CinderAdmin, host]
+                  get_param: [EndpointMap, CephRgwAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CephRgwNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, CinderApiNetwork]
+                            get_param: [ServiceNetMap, CephRgwNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CinderAdmin, port]
-      CinderV2Internal:
+            - get_param: [EndpointMap, CephRgwAdmin, port]
+      CephRgwInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, CinderInternal, host]
+              get_param: [EndpointMap, CephRgwInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CephRgwNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, CinderApiNetwork]
+                        get_param: [ServiceNetMap, CephRgwNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, CinderInternal, host]
+              get_param: [EndpointMap, CephRgwInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CephRgwNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, CinderApiNetwork]
+                - get_param: [ServiceNetMap, CephRgwNetwork]
         port:
-          get_param: [EndpointMap, CinderInternal, port]
+          get_param: [EndpointMap, CephRgwInternal, port]
         protocol:
-          get_param: [EndpointMap, CinderInternal, protocol]
+          get_param: [EndpointMap, CephRgwInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, CinderInternal, protocol]
+          - - get_param: [EndpointMap, CephRgwInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, CinderInternal, host]
+                  get_param: [EndpointMap, CephRgwInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CephRgwNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, CinderApiNetwork]
+                            get_param: [ServiceNetMap, CephRgwNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CinderInternal, port]
-            - /v2/%(tenant_id)s
+            - get_param: [EndpointMap, CephRgwInternal, port]
+            - /swift/v1
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, CinderInternal, protocol]
+          - - get_param: [EndpointMap, CephRgwInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, CinderInternal, host]
+                  get_param: [EndpointMap, CephRgwInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CephRgwNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, CinderApiNetwork]
+                            get_param: [ServiceNetMap, CephRgwNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CinderInternal, port]
-      CinderV2Public:
+            - get_param: [EndpointMap, CephRgwInternal, port]
+      CephRgwPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, CinderPublic, host]
+              get_param: [EndpointMap, CephRgwPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -856,27 +1000,33 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, CinderPublic, host]
+              get_param: [EndpointMap, CephRgwPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, CinderPublic, port]
+          get_param: [EndpointMap, CephRgwPublic, port]
         protocol:
-          get_param: [EndpointMap, CinderPublic, protocol]
+          get_param: [EndpointMap, CephRgwPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, CinderPublic, protocol]
+          - - get_param: [EndpointMap, CephRgwPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, CinderPublic, host]
+                  get_param: [EndpointMap, CephRgwPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -886,18 +1036,21 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CinderPublic, port]
-            - /v2/%(tenant_id)s
+            - get_param: [EndpointMap, CephRgwPublic, port]
+            - /swift/v1
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, CinderPublic, protocol]
+          - - get_param: [EndpointMap, CephRgwPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, CinderPublic, host]
+                  get_param: [EndpointMap, CephRgwPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -907,14 +1060,17 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CinderPublic, port]
-      CinderV3Admin:
+            - get_param: [EndpointMap, CephRgwPublic, port]
+      CinderAdmin:
         host:
           str_replace:
             template:
               get_param: [EndpointMap, CinderAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -928,7 +1084,10 @@ outputs:
             template:
               get_param: [EndpointMap, CinderAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -946,7 +1105,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, CinderAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -957,7 +1119,7 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, CinderAdmin, port]
-            - /v3/%(tenant_id)s
+            - /v1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
@@ -967,7 +1129,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, CinderAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -978,13 +1143,16 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, CinderAdmin, port]
-      CinderV3Internal:
+      CinderInternal:
         host:
           str_replace:
             template:
               get_param: [EndpointMap, CinderInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -998,7 +1166,10 @@ outputs:
             template:
               get_param: [EndpointMap, CinderInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1016,7 +1187,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, CinderInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1027,7 +1201,7 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, CinderInternal, port]
-            - /v3/%(tenant_id)s
+            - /v1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
@@ -1037,7 +1211,502 @@ outputs:
                 template:
                   get_param: [EndpointMap, CinderInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, CinderApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, CinderInternal, port]
+      CinderPublic:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CinderPublic, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, PublicNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CinderPublic, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, PublicNetwork]
+        port:
+          get_param: [EndpointMap, CinderPublic, port]
+        protocol:
+          get_param: [EndpointMap, CinderPublic, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CinderPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CinderPublic, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, PublicNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, CinderPublic, port]
+            - /v1/%(tenant_id)s
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CinderPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CinderPublic, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, PublicNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, CinderPublic, port]
+      CinderV2Admin:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CinderAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, CinderApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CinderAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, CinderApiNetwork]
+        port:
+          get_param: [EndpointMap, CinderAdmin, port]
+        protocol:
+          get_param: [EndpointMap, CinderAdmin, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CinderAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CinderAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, CinderApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, CinderAdmin, port]
+            - /v2/%(tenant_id)s
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CinderAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CinderAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, CinderApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, CinderAdmin, port]
+      CinderV2Internal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CinderInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, CinderApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CinderInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, CinderApiNetwork]
+        port:
+          get_param: [EndpointMap, CinderInternal, port]
+        protocol:
+          get_param: [EndpointMap, CinderInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CinderInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CinderInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, CinderApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, CinderInternal, port]
+            - /v2/%(tenant_id)s
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CinderInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CinderInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, CinderApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, CinderInternal, port]
+      CinderV2Public:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CinderPublic, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, PublicNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CinderPublic, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, PublicNetwork]
+        port:
+          get_param: [EndpointMap, CinderPublic, port]
+        protocol:
+          get_param: [EndpointMap, CinderPublic, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CinderPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CinderPublic, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, PublicNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, CinderPublic, port]
+            - /v2/%(tenant_id)s
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CinderPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CinderPublic, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, PublicNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, CinderPublic, port]
+      CinderV3Admin:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CinderAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, CinderApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CinderAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, CinderApiNetwork]
+        port:
+          get_param: [EndpointMap, CinderAdmin, port]
+        protocol:
+          get_param: [EndpointMap, CinderAdmin, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CinderAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CinderAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, CinderApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, CinderAdmin, port]
+            - /v3/%(tenant_id)s
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CinderAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CinderAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, CinderApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, CinderAdmin, port]
+      CinderV3Internal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CinderInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, CinderApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CinderInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, CinderApiNetwork]
+        port:
+          get_param: [EndpointMap, CinderInternal, port]
+        protocol:
+          get_param: [EndpointMap, CinderInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CinderInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CinderInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, CinderApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, CinderInternal, port]
+            - /v3/%(tenant_id)s
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CinderInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CinderInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1054,7 +1723,10 @@ outputs:
             template:
               get_param: [EndpointMap, CinderPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1068,7 +1740,10 @@ outputs:
             template:
               get_param: [EndpointMap, CinderPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1086,7 +1761,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, CinderPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1107,7 +1785,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, CinderPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1124,7 +1805,10 @@ outputs:
             template:
               get_param: [EndpointMap, GlanceAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GlanceApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1138,7 +1822,10 @@ outputs:
             template:
               get_param: [EndpointMap, GlanceAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GlanceApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1156,7 +1843,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, GlanceAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GlanceApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1176,7 +1866,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, GlanceAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GlanceApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1193,7 +1886,10 @@ outputs:
             template:
               get_param: [EndpointMap, GlanceInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GlanceApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1207,7 +1903,10 @@ outputs:
             template:
               get_param: [EndpointMap, GlanceInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GlanceApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1225,7 +1924,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, GlanceInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GlanceApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1245,7 +1947,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, GlanceInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GlanceApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1262,7 +1967,10 @@ outputs:
             template:
               get_param: [EndpointMap, GlancePublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1276,7 +1984,10 @@ outputs:
             template:
               get_param: [EndpointMap, GlancePublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1294,7 +2005,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, GlancePublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1314,7 +2028,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, GlancePublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1331,7 +2048,10 @@ outputs:
             template:
               get_param: [EndpointMap, GlanceRegistryInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GlanceRegistryNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1345,7 +2065,10 @@ outputs:
             template:
               get_param: [EndpointMap, GlanceRegistryInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GlanceRegistryNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1363,7 +2086,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, GlanceRegistryInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GlanceRegistryNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1383,7 +2109,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, GlanceRegistryInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GlanceRegistryNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1400,7 +2129,10 @@ outputs:
             template:
               get_param: [EndpointMap, GnocchiAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GnocchiApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1414,7 +2146,10 @@ outputs:
             template:
               get_param: [EndpointMap, GnocchiAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GnocchiApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1432,7 +2167,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, GnocchiAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GnocchiApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1452,7 +2190,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, GnocchiAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GnocchiApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1469,7 +2210,10 @@ outputs:
             template:
               get_param: [EndpointMap, GnocchiInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GnocchiApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1483,7 +2227,10 @@ outputs:
             template:
               get_param: [EndpointMap, GnocchiInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GnocchiApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1501,7 +2248,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, GnocchiInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GnocchiApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1521,7 +2271,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, GnocchiInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GnocchiApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1538,7 +2291,10 @@ outputs:
             template:
               get_param: [EndpointMap, GnocchiPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1552,7 +2308,10 @@ outputs:
             template:
               get_param: [EndpointMap, GnocchiPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1570,7 +2329,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, GnocchiPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1590,7 +2352,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, GnocchiPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1607,7 +2372,10 @@ outputs:
             template:
               get_param: [EndpointMap, HeatAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, HeatApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1621,7 +2389,10 @@ outputs:
             template:
               get_param: [EndpointMap, HeatAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, HeatApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1639,7 +2410,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, HeatAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1660,7 +2434,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, HeatAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1677,7 +2454,10 @@ outputs:
             template:
               get_param: [EndpointMap, HeatInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, HeatApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1691,7 +2471,10 @@ outputs:
             template:
               get_param: [EndpointMap, HeatInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, HeatApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1709,7 +2492,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, HeatInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1730,7 +2516,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, HeatInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1747,7 +2536,10 @@ outputs:
             template:
               get_param: [EndpointMap, HeatPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1761,7 +2553,10 @@ outputs:
             template:
               get_param: [EndpointMap, HeatPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1779,7 +2574,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, HeatPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1800,7 +2598,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, HeatPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1817,7 +2618,10 @@ outputs:
             template:
               get_param: [EndpointMap, HeatCfnAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, HeatApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1831,7 +2635,10 @@ outputs:
             template:
               get_param: [EndpointMap, HeatCfnAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, HeatApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1849,7 +2656,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, HeatCfnAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1870,7 +2680,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, HeatCfnAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1887,7 +2700,10 @@ outputs:
             template:
               get_param: [EndpointMap, HeatCfnInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, HeatApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1901,7 +2717,10 @@ outputs:
             template:
               get_param: [EndpointMap, HeatCfnInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, HeatApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1919,7 +2738,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, HeatCfnInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1940,7 +2762,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, HeatCfnInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -1957,7 +2782,10 @@ outputs:
             template:
               get_param: [EndpointMap, HeatCfnPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1971,7 +2799,10 @@ outputs:
             template:
               get_param: [EndpointMap, HeatCfnPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -1989,7 +2820,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, HeatCfnPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -2010,7 +2844,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, HeatCfnPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -2027,7 +2864,10 @@ outputs:
             template:
               get_param: [EndpointMap, HorizonPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -2041,7 +2881,10 @@ outputs:
             template:
               get_param: [EndpointMap, HorizonPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -2059,7 +2902,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, HorizonPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -2080,7 +2926,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, HorizonPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -2097,357 +2946,666 @@ outputs:
             template:
               get_param: [EndpointMap, IronicAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, IronicApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, IronicApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, IronicAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, IronicApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, IronicApiNetwork]
+        port:
+          get_param: [EndpointMap, IronicAdmin, port]
+        protocol:
+          get_param: [EndpointMap, IronicAdmin, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, IronicAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, IronicAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, IronicApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, IronicApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, IronicAdmin, port]
+            - /v1
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, IronicAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, IronicAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, IronicApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, IronicApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, IronicAdmin, port]
+      IronicInternal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, IronicInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, IronicApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, IronicApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, IronicInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, IronicApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, IronicApiNetwork]
+        port:
+          get_param: [EndpointMap, IronicInternal, port]
+        protocol:
+          get_param: [EndpointMap, IronicInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, IronicInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, IronicInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, IronicApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, IronicApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, IronicInternal, port]
+            - /v1
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, IronicInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, IronicInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, IronicApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, IronicApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, IronicInternal, port]
+      IronicPublic:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, IronicPublic, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, PublicNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, IronicPublic, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, PublicNetwork]
+        port:
+          get_param: [EndpointMap, IronicPublic, port]
+        protocol:
+          get_param: [EndpointMap, IronicPublic, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, IronicPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, IronicPublic, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, PublicNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, IronicPublic, port]
+            - /v1
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, IronicPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, IronicPublic, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, PublicNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, IronicPublic, port]
+      KeystoneAdmin:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, KeystoneAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, IronicApiNetwork]
+                        get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, IronicAdmin, host]
+              get_param: [EndpointMap, KeystoneAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, IronicApiNetwork]
+                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
         port:
-          get_param: [EndpointMap, IronicAdmin, port]
+          get_param: [EndpointMap, KeystoneAdmin, port]
         protocol:
-          get_param: [EndpointMap, IronicAdmin, protocol]
+          get_param: [EndpointMap, KeystoneAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, IronicAdmin, protocol]
+          - - get_param: [EndpointMap, KeystoneAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, IronicAdmin, host]
+                  get_param: [EndpointMap, KeystoneAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, IronicApiNetwork]
+                            get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, IronicAdmin, port]
-            - /v1
+            - get_param: [EndpointMap, KeystoneAdmin, port]
+            - /v2.0
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, IronicAdmin, protocol]
+          - - get_param: [EndpointMap, KeystoneAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, IronicAdmin, host]
+                  get_param: [EndpointMap, KeystoneAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, IronicApiNetwork]
+                            get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, IronicAdmin, port]
-      IronicInternal:
+            - get_param: [EndpointMap, KeystoneAdmin, port]
+      KeystoneEC2:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, IronicInternal, host]
+              get_param: [EndpointMap, KeystoneInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, IronicApiNetwork]
+                        get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, IronicInternal, host]
+              get_param: [EndpointMap, KeystoneInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, IronicApiNetwork]
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
         port:
-          get_param: [EndpointMap, IronicInternal, port]
+          get_param: [EndpointMap, KeystoneInternal, port]
         protocol:
-          get_param: [EndpointMap, IronicInternal, protocol]
+          get_param: [EndpointMap, KeystoneInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, IronicInternal, protocol]
+          - - get_param: [EndpointMap, KeystoneInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, IronicInternal, host]
+                  get_param: [EndpointMap, KeystoneInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, IronicApiNetwork]
+                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, IronicInternal, port]
-            - /v1
+            - get_param: [EndpointMap, KeystoneInternal, port]
+            - /v2.0/ec2tokens
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, IronicInternal, protocol]
+          - - get_param: [EndpointMap, KeystoneInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, IronicInternal, host]
+                  get_param: [EndpointMap, KeystoneInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, IronicApiNetwork]
+                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, IronicInternal, port]
-      IronicPublic:
+            - get_param: [EndpointMap, KeystoneInternal, port]
+      KeystoneInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, IronicPublic, host]
+              get_param: [EndpointMap, KeystoneInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, PublicNetwork]
+                        get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, IronicPublic, host]
+              get_param: [EndpointMap, KeystoneInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
         port:
-          get_param: [EndpointMap, IronicPublic, port]
+          get_param: [EndpointMap, KeystoneInternal, port]
         protocol:
-          get_param: [EndpointMap, IronicPublic, protocol]
+          get_param: [EndpointMap, KeystoneInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, IronicPublic, protocol]
+          - - get_param: [EndpointMap, KeystoneInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, IronicPublic, host]
+                  get_param: [EndpointMap, KeystoneInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, PublicNetwork]
+                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, IronicPublic, port]
-            - /v1
+            - get_param: [EndpointMap, KeystoneInternal, port]
+            - /v2.0
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, IronicPublic, protocol]
+          - - get_param: [EndpointMap, KeystoneInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, IronicPublic, host]
+                  get_param: [EndpointMap, KeystoneInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, PublicNetwork]
+                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, IronicPublic, port]
-      KeystoneAdmin:
+            - get_param: [EndpointMap, KeystoneInternal, port]
+      KeystonePublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneAdmin, host]
+              get_param: [EndpointMap, KeystonePublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                        get_param: [ServiceNetMap, PublicNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneAdmin, host]
+              get_param: [EndpointMap, KeystonePublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, KeystoneAdmin, port]
+          get_param: [EndpointMap, KeystonePublic, port]
         protocol:
-          get_param: [EndpointMap, KeystoneAdmin, protocol]
+          get_param: [EndpointMap, KeystonePublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneAdmin, protocol]
+          - - get_param: [EndpointMap, KeystonePublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneAdmin, host]
+                  get_param: [EndpointMap, KeystonePublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                            get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystoneAdmin, port]
+            - get_param: [EndpointMap, KeystonePublic, port]
             - /v2.0
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneAdmin, protocol]
+          - - get_param: [EndpointMap, KeystonePublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneAdmin, host]
+                  get_param: [EndpointMap, KeystonePublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                            get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystoneAdmin, port]
-      KeystoneEC2:
+            - get_param: [EndpointMap, KeystonePublic, port]
+      KeystoneV3Admin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneInternal, host]
+              get_param: [EndpointMap, KeystoneAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                        get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneInternal, host]
+              get_param: [EndpointMap, KeystoneAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
         port:
-          get_param: [EndpointMap, KeystoneInternal, port]
+          get_param: [EndpointMap, KeystoneAdmin, port]
         protocol:
-          get_param: [EndpointMap, KeystoneInternal, protocol]
+          get_param: [EndpointMap, KeystoneAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneInternal, protocol]
+          - - get_param: [EndpointMap, KeystoneAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneInternal, host]
+                  get_param: [EndpointMap, KeystoneAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                            get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystoneInternal, port]
-            - /v2.0/ec2tokens
+            - get_param: [EndpointMap, KeystoneAdmin, port]
+            - /v3
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneInternal, protocol]
+          - - get_param: [EndpointMap, KeystoneAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneInternal, host]
+                  get_param: [EndpointMap, KeystoneAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                            get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystoneInternal, port]
-      KeystoneInternal:
+            - get_param: [EndpointMap, KeystoneAdmin, port]
+      KeystoneV3Internal:
         host:
           str_replace:
             template:
               get_param: [EndpointMap, KeystoneInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -2461,7 +3619,10 @@ outputs:
             template:
               get_param: [EndpointMap, KeystoneInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -2479,7 +3640,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, KeystoneInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -2490,7 +3654,7 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, KeystoneInternal, port]
-            - /v2.0
+            - /v3
         uri_no_suffix:
           list_join:
           - ''
@@ -2500,7 +3664,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, KeystoneInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -2511,13 +3678,16 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, KeystoneInternal, port]
-      KeystonePublic:
+      KeystoneV3Public:
         host:
           str_replace:
             template:
               get_param: [EndpointMap, KeystonePublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -2531,7 +3701,10 @@ outputs:
             template:
               get_param: [EndpointMap, KeystonePublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -2549,7 +3722,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, KeystonePublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -2560,7 +3736,7 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, KeystonePublic, port]
-            - /v2.0
+            - /v3
         uri_no_suffix:
           list_join:
           - ''
@@ -2570,7 +3746,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, KeystonePublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -2581,153 +3760,180 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, KeystonePublic, port]
-      KeystoneV3Admin:
+      ManilaAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneAdmin, host]
+              get_param: [EndpointMap, ManilaAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                        get_param: [ServiceNetMap, ManilaApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneAdmin, host]
+              get_param: [EndpointMap, ManilaAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
         port:
-          get_param: [EndpointMap, KeystoneAdmin, port]
+          get_param: [EndpointMap, ManilaAdmin, port]
         protocol:
-          get_param: [EndpointMap, KeystoneAdmin, protocol]
+          get_param: [EndpointMap, ManilaAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneAdmin, protocol]
+          - - get_param: [EndpointMap, ManilaAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneAdmin, host]
+                  get_param: [EndpointMap, ManilaAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                            get_param: [ServiceNetMap, ManilaApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystoneAdmin, port]
-            - /v3
+            - get_param: [EndpointMap, ManilaAdmin, port]
+            - /v2/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneAdmin, protocol]
+          - - get_param: [EndpointMap, ManilaAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneAdmin, host]
+                  get_param: [EndpointMap, ManilaAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                            get_param: [ServiceNetMap, ManilaApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystoneAdmin, port]
-      KeystoneV3Internal:
+            - get_param: [EndpointMap, ManilaAdmin, port]
+      ManilaInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneInternal, host]
+              get_param: [EndpointMap, ManilaInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                        get_param: [ServiceNetMap, ManilaApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneInternal, host]
+              get_param: [EndpointMap, ManilaInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
         port:
-          get_param: [EndpointMap, KeystoneInternal, port]
+          get_param: [EndpointMap, ManilaInternal, port]
         protocol:
-          get_param: [EndpointMap, KeystoneInternal, protocol]
+          get_param: [EndpointMap, ManilaInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneInternal, protocol]
+          - - get_param: [EndpointMap, ManilaInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneInternal, host]
+                  get_param: [EndpointMap, ManilaInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                            get_param: [ServiceNetMap, ManilaApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystoneInternal, port]
-            - /v3
+            - get_param: [EndpointMap, ManilaInternal, port]
+            - /v2/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneInternal, protocol]
+          - - get_param: [EndpointMap, ManilaInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneInternal, host]
+                  get_param: [EndpointMap, ManilaInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                            get_param: [ServiceNetMap, ManilaApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystoneInternal, port]
-      KeystoneV3Public:
+            - get_param: [EndpointMap, ManilaInternal, port]
+      ManilaPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystonePublic, host]
+              get_param: [EndpointMap, ManilaPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -2739,27 +3945,33 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystonePublic, host]
+              get_param: [EndpointMap, ManilaPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, KeystonePublic, port]
+          get_param: [EndpointMap, ManilaPublic, port]
         protocol:
-          get_param: [EndpointMap, KeystonePublic, protocol]
+          get_param: [EndpointMap, ManilaPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystonePublic, protocol]
+          - - get_param: [EndpointMap, ManilaPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystonePublic, host]
+                  get_param: [EndpointMap, ManilaPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -2769,18 +3981,21 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystonePublic, port]
-            - /v3
+            - get_param: [EndpointMap, ManilaPublic, port]
+            - /v2/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystonePublic, protocol]
+          - - get_param: [EndpointMap, ManilaPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystonePublic, host]
+                  get_param: [EndpointMap, ManilaPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -2790,14 +4005,17 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystonePublic, port]
-      ManilaAdmin:
+            - get_param: [EndpointMap, ManilaPublic, port]
+      ManilaV1Admin:
         host:
           str_replace:
             template:
               get_param: [EndpointMap, ManilaAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -2811,7 +4029,10 @@ outputs:
             template:
               get_param: [EndpointMap, ManilaAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -2829,7 +4050,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, ManilaAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -2840,7 +4064,7 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, ManilaAdmin, port]
-            - /v2/%(tenant_id)s
+            - /v1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
@@ -2850,7 +4074,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, ManilaAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -2861,13 +4088,16 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, ManilaAdmin, port]
-      ManilaInternal:
+      ManilaV1Internal:
         host:
           str_replace:
             template:
               get_param: [EndpointMap, ManilaInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -2881,7 +4111,10 @@ outputs:
             template:
               get_param: [EndpointMap, ManilaInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -2899,7 +4132,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, ManilaInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -2910,7 +4146,7 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, ManilaInternal, port]
-            - /v2/%(tenant_id)s
+            - /v1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
@@ -2920,7 +4156,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, ManilaInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -2931,13 +4170,16 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, ManilaInternal, port]
-      ManilaPublic:
+      ManilaV1Public:
         host:
           str_replace:
             template:
               get_param: [EndpointMap, ManilaPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -2951,7 +4193,10 @@ outputs:
             template:
               get_param: [EndpointMap, ManilaPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -2969,7 +4214,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, ManilaPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -2980,7 +4228,7 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, ManilaPublic, port]
-            - /v2/%(tenant_id)s
+            - /v1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
@@ -2990,7 +4238,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, ManilaPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3001,153 +4252,180 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, ManilaPublic, port]
-      ManilaV1Admin:
+      MistralAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, ManilaAdmin, host]
+              get_param: [EndpointMap, MistralAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, MistralApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, ManilaApiNetwork]
+                        get_param: [ServiceNetMap, MistralApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, ManilaAdmin, host]
+              get_param: [EndpointMap, MistralAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, MistralApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, ManilaApiNetwork]
+                - get_param: [ServiceNetMap, MistralApiNetwork]
         port:
-          get_param: [EndpointMap, ManilaAdmin, port]
+          get_param: [EndpointMap, MistralAdmin, port]
         protocol:
-          get_param: [EndpointMap, ManilaAdmin, protocol]
+          get_param: [EndpointMap, MistralAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, ManilaAdmin, protocol]
+          - - get_param: [EndpointMap, MistralAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, ManilaAdmin, host]
+                  get_param: [EndpointMap, MistralAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, MistralApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, ManilaApiNetwork]
+                            get_param: [ServiceNetMap, MistralApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, ManilaAdmin, port]
-            - /v1/%(tenant_id)s
+            - get_param: [EndpointMap, MistralAdmin, port]
+            - /v2
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, ManilaAdmin, protocol]
+          - - get_param: [EndpointMap, MistralAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, ManilaAdmin, host]
+                  get_param: [EndpointMap, MistralAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, MistralApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, ManilaApiNetwork]
+                            get_param: [ServiceNetMap, MistralApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, ManilaAdmin, port]
-      ManilaV1Internal:
+            - get_param: [EndpointMap, MistralAdmin, port]
+      MistralInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, ManilaInternal, host]
+              get_param: [EndpointMap, MistralInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, MistralApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, ManilaApiNetwork]
+                        get_param: [ServiceNetMap, MistralApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, ManilaInternal, host]
+              get_param: [EndpointMap, MistralInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, MistralApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, ManilaApiNetwork]
+                - get_param: [ServiceNetMap, MistralApiNetwork]
         port:
-          get_param: [EndpointMap, ManilaInternal, port]
+          get_param: [EndpointMap, MistralInternal, port]
         protocol:
-          get_param: [EndpointMap, ManilaInternal, protocol]
+          get_param: [EndpointMap, MistralInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, ManilaInternal, protocol]
+          - - get_param: [EndpointMap, MistralInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, ManilaInternal, host]
+                  get_param: [EndpointMap, MistralInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, MistralApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, ManilaApiNetwork]
+                            get_param: [ServiceNetMap, MistralApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, ManilaInternal, port]
-            - /v1/%(tenant_id)s
+            - get_param: [EndpointMap, MistralInternal, port]
+            - /v2
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, ManilaInternal, protocol]
+          - - get_param: [EndpointMap, MistralInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, ManilaInternal, host]
+                  get_param: [EndpointMap, MistralInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, MistralApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, ManilaApiNetwork]
+                            get_param: [ServiceNetMap, MistralApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, ManilaInternal, port]
-      ManilaV1Public:
+            - get_param: [EndpointMap, MistralInternal, port]
+      MistralPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, ManilaPublic, host]
+              get_param: [EndpointMap, MistralPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3159,27 +4437,33 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, ManilaPublic, host]
+              get_param: [EndpointMap, MistralPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, ManilaPublic, port]
+          get_param: [EndpointMap, MistralPublic, port]
         protocol:
-          get_param: [EndpointMap, ManilaPublic, protocol]
+          get_param: [EndpointMap, MistralPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, ManilaPublic, protocol]
+          - - get_param: [EndpointMap, MistralPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, ManilaPublic, host]
+                  get_param: [EndpointMap, MistralPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3189,18 +4473,21 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, ManilaPublic, port]
-            - /v1/%(tenant_id)s
+            - get_param: [EndpointMap, MistralPublic, port]
+            - /v2
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, ManilaPublic, protocol]
+          - - get_param: [EndpointMap, MistralPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, ManilaPublic, host]
+                  get_param: [EndpointMap, MistralPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3210,14 +4497,17 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, ManilaPublic, port]
+            - get_param: [EndpointMap, MistralPublic, port]
       MysqlInternal:
         host:
           str_replace:
             template:
               get_param: [EndpointMap, MysqlInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, MysqlNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3231,7 +4521,10 @@ outputs:
             template:
               get_param: [EndpointMap, MysqlInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, MysqlNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3249,7 +4542,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, MysqlInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, MysqlNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3269,7 +4565,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, MysqlInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, MysqlNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3286,7 +4585,10 @@ outputs:
             template:
               get_param: [EndpointMap, NeutronAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NeutronApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3300,7 +4602,10 @@ outputs:
             template:
               get_param: [EndpointMap, NeutronAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NeutronApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3318,7 +4623,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, NeutronAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NeutronApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3338,7 +4646,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, NeutronAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NeutronApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3355,7 +4666,10 @@ outputs:
             template:
               get_param: [EndpointMap, NeutronInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NeutronApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3369,7 +4683,10 @@ outputs:
             template:
               get_param: [EndpointMap, NeutronInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NeutronApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3387,7 +4704,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, NeutronInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NeutronApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3407,7 +4727,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, NeutronInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NeutronApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3424,7 +4747,10 @@ outputs:
             template:
               get_param: [EndpointMap, NeutronPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3438,7 +4764,10 @@ outputs:
             template:
               get_param: [EndpointMap, NeutronPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3456,7 +4785,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, NeutronPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3476,7 +4808,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, NeutronPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3493,7 +4828,10 @@ outputs:
             template:
               get_param: [EndpointMap, NovaAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3507,7 +4845,10 @@ outputs:
             template:
               get_param: [EndpointMap, NovaAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3525,7 +4866,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, NovaAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3546,7 +4890,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, NovaAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3563,7 +4910,10 @@ outputs:
             template:
               get_param: [EndpointMap, NovaInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3577,7 +4927,10 @@ outputs:
             template:
               get_param: [EndpointMap, NovaInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3595,7 +4948,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, NovaInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3616,7 +4972,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, NovaInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3633,7 +4992,10 @@ outputs:
             template:
               get_param: [EndpointMap, NovaPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3647,7 +5009,10 @@ outputs:
             template:
               get_param: [EndpointMap, NovaPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3665,7 +5030,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, NovaPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3686,7 +5054,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, NovaPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3703,7 +5074,10 @@ outputs:
             template:
               get_param: [EndpointMap, NovaVNCProxyAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3717,7 +5091,10 @@ outputs:
             template:
               get_param: [EndpointMap, NovaVNCProxyAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3735,7 +5112,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, NovaVNCProxyAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3755,7 +5135,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, NovaVNCProxyAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3772,7 +5155,10 @@ outputs:
             template:
               get_param: [EndpointMap, NovaVNCProxyInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3786,7 +5172,10 @@ outputs:
             template:
               get_param: [EndpointMap, NovaVNCProxyInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3804,7 +5193,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, NovaVNCProxyInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3824,7 +5216,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, NovaVNCProxyInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3841,7 +5236,10 @@ outputs:
             template:
               get_param: [EndpointMap, NovaVNCProxyPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3855,7 +5253,10 @@ outputs:
             template:
               get_param: [EndpointMap, NovaVNCProxyPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3873,7 +5274,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, NovaVNCProxyPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3893,7 +5297,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, NovaVNCProxyPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3910,7 +5317,10 @@ outputs:
             template:
               get_param: [EndpointMap, SaharaAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3924,7 +5334,10 @@ outputs:
             template:
               get_param: [EndpointMap, SaharaAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3942,7 +5355,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, SaharaAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SaharaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3963,7 +5379,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, SaharaAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SaharaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -3980,7 +5399,10 @@ outputs:
             template:
               get_param: [EndpointMap, SaharaInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -3994,7 +5416,10 @@ outputs:
             template:
               get_param: [EndpointMap, SaharaInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -4012,7 +5437,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, SaharaInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SaharaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -4033,7 +5461,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, SaharaInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SaharaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -4050,7 +5481,10 @@ outputs:
             template:
               get_param: [EndpointMap, SaharaPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -4064,7 +5498,10 @@ outputs:
             template:
               get_param: [EndpointMap, SaharaPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -4082,7 +5519,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, SaharaPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -4103,7 +5543,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, SaharaPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -4120,7 +5563,10 @@ outputs:
             template:
               get_param: [EndpointMap, SwiftAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -4134,7 +5580,10 @@ outputs:
             template:
               get_param: [EndpointMap, SwiftAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -4152,7 +5601,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, SwiftAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -4172,7 +5624,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, SwiftAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -4189,7 +5644,10 @@ outputs:
             template:
               get_param: [EndpointMap, SwiftInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -4203,7 +5661,10 @@ outputs:
             template:
               get_param: [EndpointMap, SwiftInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -4221,7 +5682,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, SwiftInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -4242,7 +5706,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, SwiftInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -4259,7 +5726,10 @@ outputs:
             template:
               get_param: [EndpointMap, SwiftPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -4273,7 +5743,10 @@ outputs:
             template:
               get_param: [EndpointMap, SwiftPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -4291,7 +5764,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, SwiftPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -4312,7 +5788,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, SwiftPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -4329,7 +5808,10 @@ outputs:
             template:
               get_param: [EndpointMap, SwiftAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -4343,7 +5825,10 @@ outputs:
             template:
               get_param: [EndpointMap, SwiftAdmin, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -4361,7 +5846,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, SwiftAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -4381,7 +5869,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, SwiftAdmin, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -4398,7 +5889,10 @@ outputs:
             template:
               get_param: [EndpointMap, SwiftInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -4412,7 +5906,10 @@ outputs:
             template:
               get_param: [EndpointMap, SwiftInternal, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -4430,7 +5927,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, SwiftInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -4450,7 +5950,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, SwiftInternal, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -4467,7 +5970,10 @@ outputs:
             template:
               get_param: [EndpointMap, SwiftPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -4481,7 +5987,10 @@ outputs:
             template:
               get_param: [EndpointMap, SwiftPublic, host]
             params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
@@ -4499,7 +6008,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, SwiftPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
@@ -4519,7 +6031,10 @@ outputs:
                 template:
                   get_param: [EndpointMap, SwiftPublic, host]
                 params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap