Merge "Use provided qemu.conf in libvirt container"

[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 dd29bcd..af89d0b 100644 (file)
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -2,7 +2,7 @@
 ### This file is automatically generated from endpoint_data.yaml
 ### by the script build_endpoint_map.py
 
-heat_template_version: '2015-04-30'
+heat_template_version: ocata
 description: A map of OpenStack endpoints. Since the endpoints are URLs,
   we need to have brackets around IPv6 IP addresses. The inputs to these
   parameters come from net_ip_uri_map, which will include these brackets
@@ -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}
@@ -61,12 +70,21 @@ parameters:
       NovaVNCProxyAdmin: {protocol: http, port: '6080', host: IP_ADDRESS}
       NovaVNCProxyInternal: {protocol: http, port: '6080', host: IP_ADDRESS}
       NovaVNCProxyPublic: {protocol: http, port: '6080', host: IP_ADDRESS}
+      PankoAdmin: {protocol: http, port: '8779', host: IP_ADDRESS}
+      PankoInternal: {protocol: http, port: '8779', host: IP_ADDRESS}
+      PankoPublic: {protocol: http, port: '8779', host: IP_ADDRESS}
       SaharaAdmin: {protocol: http, port: '8386', host: IP_ADDRESS}
       SaharaInternal: {protocol: http, port: '8386', host: IP_ADDRESS}
       SaharaPublic: {protocol: http, port: '8386', host: IP_ADDRESS}
       SwiftAdmin: {protocol: http, port: '8080', host: IP_ADDRESS}
       SwiftInternal: {protocol: http, port: '8080', host: IP_ADDRESS}
       SwiftPublic: {protocol: http, port: '8080', host: IP_ADDRESS}
+      ZaqarAdmin: {protocol: http, port: '8888', host: IP_ADDRESS}
+      ZaqarInternal: {protocol: http, port: '8888', host: IP_ADDRESS}
+      ZaqarPublic: {protocol: http, port: '8888', host: IP_ADDRESS}
+      ZaqarWebSocketAdmin: {protocol: ws, port: '9000', host: IP_ADDRESS}
+      ZaqarWebSocketInternal: {protocol: ws, port: '9000', host: IP_ADDRESS}
+      ZaqarWebSocketPublic: {protocol: ws, port: '9000', host: IP_ADDRESS}
     description: Mapping of service endpoint -> protocol. Typically set
       via parameter_defaults in the resource registry.
   CloudEndpoints:
@@ -320,173 +338,173 @@ 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:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, CeilometerApiNetwork]
+                - 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:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, CeilometerApiNetwork]
+                - 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:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, CeilometerApiNetwork]
+                    - 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:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, CeilometerApiNetwork]
+                    - 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:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, CeilometerApiNetwork]
+                - 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:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, CeilometerApiNetwork]
+                - 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:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, CeilometerApiNetwork]
+                    - 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:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, CeilometerApiNetwork]
+                    - 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:
@@ -503,7 +521,7 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, CeilometerPublic, host]
+              get_param: [EndpointMap, BarbicanPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -514,17 +532,17 @@ outputs:
                 - 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:
@@ -539,15 +557,15 @@ 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:
@@ -562,176 +580,174 @@ 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:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, CinderApiNetwork]
+                - 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:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, CinderApiNetwork]
+                - 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:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, CinderApiNetwork]
+                    - 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:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, CinderApiNetwork]
+                    - 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:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, CinderApiNetwork]
+                - 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:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, CinderApiNetwork]
+                - 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:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, CinderApiNetwork]
+                    - 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:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, CinderApiNetwork]
+                    - 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:
@@ -748,7 +764,7 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, CinderPublic, host]
+              get_param: [EndpointMap, CeilometerPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -759,17 +775,17 @@ outputs:
                 - 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:
@@ -784,16 +800,15 @@ 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:
@@ -808,176 +823,176 @@ 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:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, CinderApiNetwork]
+                - 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:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, CinderApiNetwork]
+                - 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:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, CinderApiNetwork]
+                    - 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:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, CinderApiNetwork]
+                    - 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:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, CinderApiNetwork]
+                - 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:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, CinderApiNetwork]
+                - 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:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, CinderApiNetwork]
+                    - 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:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, CinderApiNetwork]
+                    - 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:
@@ -994,7 +1009,7 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, CinderPublic, host]
+              get_param: [EndpointMap, CephRgwPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -1005,17 +1020,17 @@ outputs:
                 - 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:
@@ -1030,16 +1045,16 @@ 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:
@@ -1054,8 +1069,8 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, CinderPublic, port]
-      CinderV3Admin:
+            - get_param: [EndpointMap, CephRgwPublic, port]
+      CinderAdmin:
         host:
           str_replace:
             template:
@@ -1113,7 +1128,7 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, CinderAdmin, port]
-            - /v3/%(tenant_id)s
+            - /v1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
@@ -1137,7 +1152,7 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, CinderAdmin, port]
-      CinderV3Internal:
+      CinderInternal:
         host:
           str_replace:
             template:
@@ -1195,7 +1210,7 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, CinderInternal, port]
-            - /v3/%(tenant_id)s
+            - /v1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
@@ -1219,7 +1234,7 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, CinderInternal, port]
-      CinderV3Public:
+      CinderPublic:
         host:
           str_replace:
             template:
@@ -1277,7 +1292,7 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, CinderPublic, port]
-            - /v3/%(tenant_id)s
+            - /v1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
@@ -1301,173 +1316,175 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, CinderPublic, port]
-      GlanceAdmin:
+      CinderV2Admin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, GlanceAdmin, host]
+              get_param: [EndpointMap, CinderAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, GlanceApiNetwork]
+                - get_param: [ServiceNetMap, CinderApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, GlanceApiNetwork]
+                        get_param: [ServiceNetMap, CinderApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, GlanceAdmin, host]
+              get_param: [EndpointMap, CinderAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, GlanceApiNetwork]
+                - get_param: [ServiceNetMap, CinderApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, GlanceApiNetwork]
+                - get_param: [ServiceNetMap, CinderApiNetwork]
         port:
-          get_param: [EndpointMap, GlanceAdmin, port]
+          get_param: [EndpointMap, CinderAdmin, port]
         protocol:
-          get_param: [EndpointMap, GlanceAdmin, protocol]
+          get_param: [EndpointMap, CinderAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, GlanceAdmin, protocol]
+          - - get_param: [EndpointMap, CinderAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, GlanceAdmin, host]
+                  get_param: [EndpointMap, CinderAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, GlanceApiNetwork]
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, GlanceApiNetwork]
+                            get_param: [ServiceNetMap, CinderApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, GlanceAdmin, port]
+            - get_param: [EndpointMap, CinderAdmin, port]
+            - /v2/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, GlanceAdmin, protocol]
+          - - get_param: [EndpointMap, CinderAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, GlanceAdmin, host]
+                  get_param: [EndpointMap, CinderAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, GlanceApiNetwork]
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, GlanceApiNetwork]
+                            get_param: [ServiceNetMap, CinderApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, GlanceAdmin, port]
-      GlanceInternal:
+            - get_param: [EndpointMap, CinderAdmin, port]
+      CinderV2Internal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, GlanceInternal, host]
+              get_param: [EndpointMap, CinderInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, GlanceApiNetwork]
+                - get_param: [ServiceNetMap, CinderApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, GlanceApiNetwork]
+                        get_param: [ServiceNetMap, CinderApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, GlanceInternal, host]
+              get_param: [EndpointMap, CinderInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, GlanceApiNetwork]
+                - get_param: [ServiceNetMap, CinderApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, GlanceApiNetwork]
+                - get_param: [ServiceNetMap, CinderApiNetwork]
         port:
-          get_param: [EndpointMap, GlanceInternal, port]
+          get_param: [EndpointMap, CinderInternal, port]
         protocol:
-          get_param: [EndpointMap, GlanceInternal, protocol]
+          get_param: [EndpointMap, CinderInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, GlanceInternal, protocol]
+          - - get_param: [EndpointMap, CinderInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, GlanceInternal, host]
+                  get_param: [EndpointMap, CinderInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, GlanceApiNetwork]
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, GlanceApiNetwork]
+                            get_param: [ServiceNetMap, CinderApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, GlanceInternal, port]
+            - get_param: [EndpointMap, CinderInternal, port]
+            - /v2/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, GlanceInternal, protocol]
+          - - get_param: [EndpointMap, CinderInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, GlanceInternal, host]
+                  get_param: [EndpointMap, CinderInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, GlanceApiNetwork]
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, GlanceApiNetwork]
+                            get_param: [ServiceNetMap, CinderApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, GlanceInternal, port]
-      GlancePublic:
+            - get_param: [EndpointMap, CinderInternal, port]
+      CinderV2Public:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, GlancePublic, host]
+              get_param: [EndpointMap, CinderPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -1484,7 +1501,7 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, GlancePublic, host]
+              get_param: [EndpointMap, CinderPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -1495,17 +1512,17 @@ outputs:
                 - NetIpMap
                 - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, GlancePublic, port]
+          get_param: [EndpointMap, CinderPublic, port]
         protocol:
-          get_param: [EndpointMap, GlancePublic, protocol]
+          get_param: [EndpointMap, CinderPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, GlancePublic, protocol]
+          - - get_param: [EndpointMap, CinderPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, GlancePublic, host]
+                  get_param: [EndpointMap, CinderPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
@@ -1520,15 +1537,16 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, GlancePublic, port]
+            - get_param: [EndpointMap, CinderPublic, port]
+            - /v2/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, GlancePublic, protocol]
+          - - get_param: [EndpointMap, CinderPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, GlancePublic, host]
+                  get_param: [EndpointMap, CinderPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
@@ -1543,746 +1561,744 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, GlancePublic, port]
-      GlanceRegistryInternal:
+            - get_param: [EndpointMap, CinderPublic, port]
+      CinderV3Admin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, GlanceRegistryInternal, host]
+              get_param: [EndpointMap, CinderAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, GlanceRegistryNetwork]
+                - get_param: [ServiceNetMap, CinderApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, GlanceRegistryNetwork]
+                        get_param: [ServiceNetMap, CinderApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, GlanceRegistryInternal, host]
+              get_param: [EndpointMap, CinderAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, GlanceRegistryNetwork]
+                - get_param: [ServiceNetMap, CinderApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, GlanceRegistryNetwork]
+                - get_param: [ServiceNetMap, CinderApiNetwork]
         port:
-          get_param: [EndpointMap, GlanceRegistryInternal, port]
+          get_param: [EndpointMap, CinderAdmin, port]
         protocol:
-          get_param: [EndpointMap, GlanceRegistryInternal, protocol]
+          get_param: [EndpointMap, CinderAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, GlanceRegistryInternal, protocol]
+          - - get_param: [EndpointMap, CinderAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, GlanceRegistryInternal, host]
+                  get_param: [EndpointMap, CinderAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, GlanceRegistryNetwork]
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, GlanceRegistryNetwork]
+                            get_param: [ServiceNetMap, CinderApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, GlanceRegistryInternal, port]
+            - get_param: [EndpointMap, CinderAdmin, port]
+            - /v3/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, GlanceRegistryInternal, protocol]
+          - - get_param: [EndpointMap, CinderAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, GlanceRegistryInternal, host]
+                  get_param: [EndpointMap, CinderAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, GlanceRegistryNetwork]
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, GlanceRegistryNetwork]
+                            get_param: [ServiceNetMap, CinderApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, GlanceRegistryInternal, port]
-      GnocchiAdmin:
+            - get_param: [EndpointMap, CinderAdmin, port]
+      CinderV3Internal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, GnocchiAdmin, host]
+              get_param: [EndpointMap, CinderInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, GnocchiApiNetwork]
+                - get_param: [ServiceNetMap, CinderApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, GnocchiApiNetwork]
+                        get_param: [ServiceNetMap, CinderApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, GnocchiAdmin, host]
+              get_param: [EndpointMap, CinderInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, GnocchiApiNetwork]
+                - get_param: [ServiceNetMap, CinderApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, GnocchiApiNetwork]
+                - get_param: [ServiceNetMap, CinderApiNetwork]
         port:
-          get_param: [EndpointMap, GnocchiAdmin, port]
+          get_param: [EndpointMap, CinderInternal, port]
         protocol:
-          get_param: [EndpointMap, GnocchiAdmin, protocol]
+          get_param: [EndpointMap, CinderInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, GnocchiAdmin, protocol]
+          - - get_param: [EndpointMap, CinderInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, GnocchiAdmin, host]
+                  get_param: [EndpointMap, CinderInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, GnocchiApiNetwork]
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, GnocchiApiNetwork]
+                            get_param: [ServiceNetMap, CinderApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, GnocchiAdmin, port]
+            - get_param: [EndpointMap, CinderInternal, port]
+            - /v3/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, GnocchiAdmin, protocol]
+          - - get_param: [EndpointMap, CinderInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, GnocchiAdmin, host]
+                  get_param: [EndpointMap, CinderInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, GnocchiApiNetwork]
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, GnocchiApiNetwork]
+                            get_param: [ServiceNetMap, CinderApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, GnocchiAdmin, port]
-      GnocchiInternal:
+            - get_param: [EndpointMap, CinderInternal, port]
+      CinderV3Public:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, GnocchiInternal, host]
+              get_param: [EndpointMap, CinderPublic, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, GnocchiApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, GnocchiApiNetwork]
+                        get_param: [ServiceNetMap, PublicNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, GnocchiInternal, host]
+              get_param: [EndpointMap, CinderPublic, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, GnocchiApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, GnocchiApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, GnocchiInternal, port]
+          get_param: [EndpointMap, CinderPublic, port]
         protocol:
-          get_param: [EndpointMap, GnocchiInternal, protocol]
+          get_param: [EndpointMap, CinderPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, GnocchiInternal, protocol]
+          - - get_param: [EndpointMap, CinderPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, GnocchiInternal, host]
+                  get_param: [EndpointMap, CinderPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, GnocchiApiNetwork]
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, GnocchiApiNetwork]
+                            get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, GnocchiInternal, port]
+            - get_param: [EndpointMap, CinderPublic, port]
+            - /v3/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, GnocchiInternal, protocol]
+          - - get_param: [EndpointMap, CinderPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, GnocchiInternal, host]
+                  get_param: [EndpointMap, CinderPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, GnocchiApiNetwork]
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, GnocchiApiNetwork]
+                            get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, GnocchiInternal, port]
-      GnocchiPublic:
+            - get_param: [EndpointMap, CinderPublic, port]
+      GlanceAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, GnocchiPublic, host]
+              get_param: [EndpointMap, GlanceAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, GlanceApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, PublicNetwork]
+                        get_param: [ServiceNetMap, GlanceApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, GnocchiPublic, host]
+              get_param: [EndpointMap, GlanceAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, GlanceApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, GlanceApiNetwork]
         port:
-          get_param: [EndpointMap, GnocchiPublic, port]
+          get_param: [EndpointMap, GlanceAdmin, port]
         protocol:
-          get_param: [EndpointMap, GnocchiPublic, protocol]
+          get_param: [EndpointMap, GlanceAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, GnocchiPublic, protocol]
+          - - get_param: [EndpointMap, GlanceAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, GnocchiPublic, host]
+                  get_param: [EndpointMap, GlanceAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, PublicNetwork]
+                    - get_param: [ServiceNetMap, GlanceApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, PublicNetwork]
+                            get_param: [ServiceNetMap, GlanceApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, GnocchiPublic, port]
+            - get_param: [EndpointMap, GlanceAdmin, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, GnocchiPublic, protocol]
+          - - get_param: [EndpointMap, GlanceAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, GnocchiPublic, host]
+                  get_param: [EndpointMap, GlanceAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, PublicNetwork]
+                    - get_param: [ServiceNetMap, GlanceApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, PublicNetwork]
+                            get_param: [ServiceNetMap, GlanceApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, GnocchiPublic, port]
-      HeatAdmin:
+            - get_param: [EndpointMap, GlanceAdmin, port]
+      GlanceInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, HeatAdmin, host]
+              get_param: [EndpointMap, GlanceInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, HeatApiNetwork]
+                - get_param: [ServiceNetMap, GlanceApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, HeatApiNetwork]
+                        get_param: [ServiceNetMap, GlanceApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, HeatAdmin, host]
+              get_param: [EndpointMap, GlanceInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, HeatApiNetwork]
+                - get_param: [ServiceNetMap, GlanceApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, HeatApiNetwork]
+                - get_param: [ServiceNetMap, GlanceApiNetwork]
         port:
-          get_param: [EndpointMap, HeatAdmin, port]
+          get_param: [EndpointMap, GlanceInternal, port]
         protocol:
-          get_param: [EndpointMap, HeatAdmin, protocol]
+          get_param: [EndpointMap, GlanceInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, HeatAdmin, protocol]
+          - - get_param: [EndpointMap, GlanceInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, HeatAdmin, host]
+                  get_param: [EndpointMap, GlanceInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, HeatApiNetwork]
+                    - get_param: [ServiceNetMap, GlanceApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, HeatApiNetwork]
+                            get_param: [ServiceNetMap, GlanceApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, HeatAdmin, port]
-            - /v1/%(tenant_id)s
+            - get_param: [EndpointMap, GlanceInternal, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, HeatAdmin, protocol]
+          - - get_param: [EndpointMap, GlanceInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, HeatAdmin, host]
+                  get_param: [EndpointMap, GlanceInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, HeatApiNetwork]
+                    - get_param: [ServiceNetMap, GlanceApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, HeatApiNetwork]
+                            get_param: [ServiceNetMap, GlanceApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, HeatAdmin, port]
-      HeatInternal:
+            - get_param: [EndpointMap, GlanceInternal, port]
+      GlancePublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, HeatInternal, host]
+              get_param: [EndpointMap, GlancePublic, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, HeatApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, HeatApiNetwork]
+                        get_param: [ServiceNetMap, PublicNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, HeatInternal, host]
+              get_param: [EndpointMap, GlancePublic, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, HeatApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, HeatApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, HeatInternal, port]
+          get_param: [EndpointMap, GlancePublic, port]
         protocol:
-          get_param: [EndpointMap, HeatInternal, protocol]
+          get_param: [EndpointMap, GlancePublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, HeatInternal, protocol]
+          - - get_param: [EndpointMap, GlancePublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, HeatInternal, host]
+                  get_param: [EndpointMap, GlancePublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, HeatApiNetwork]
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, HeatApiNetwork]
+                            get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, HeatInternal, port]
-            - /v1/%(tenant_id)s
+            - get_param: [EndpointMap, GlancePublic, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, HeatInternal, protocol]
+          - - get_param: [EndpointMap, GlancePublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, HeatInternal, host]
+                  get_param: [EndpointMap, GlancePublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, HeatApiNetwork]
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, HeatApiNetwork]
+                            get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, HeatInternal, port]
-      HeatPublic:
+            - get_param: [EndpointMap, GlancePublic, port]
+      GlanceRegistryInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, HeatPublic, host]
+              get_param: [EndpointMap, GlanceRegistryInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, GlanceRegistryNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, PublicNetwork]
+                        get_param: [ServiceNetMap, GlanceRegistryNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, HeatPublic, host]
+              get_param: [EndpointMap, GlanceRegistryInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, GlanceRegistryNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, GlanceRegistryNetwork]
         port:
-          get_param: [EndpointMap, HeatPublic, port]
+          get_param: [EndpointMap, GlanceRegistryInternal, port]
         protocol:
-          get_param: [EndpointMap, HeatPublic, protocol]
+          get_param: [EndpointMap, GlanceRegistryInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, HeatPublic, protocol]
+          - - get_param: [EndpointMap, GlanceRegistryInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, HeatPublic, host]
+                  get_param: [EndpointMap, GlanceRegistryInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, PublicNetwork]
+                    - get_param: [ServiceNetMap, GlanceRegistryNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, PublicNetwork]
+                            get_param: [ServiceNetMap, GlanceRegistryNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, HeatPublic, port]
-            - /v1/%(tenant_id)s
+            - get_param: [EndpointMap, GlanceRegistryInternal, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, HeatPublic, protocol]
+          - - get_param: [EndpointMap, GlanceRegistryInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, HeatPublic, host]
+                  get_param: [EndpointMap, GlanceRegistryInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, PublicNetwork]
+                    - get_param: [ServiceNetMap, GlanceRegistryNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, PublicNetwork]
+                            get_param: [ServiceNetMap, GlanceRegistryNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, HeatPublic, port]
-      HeatCfnAdmin:
+            - get_param: [EndpointMap, GlanceRegistryInternal, port]
+      GnocchiAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, HeatCfnAdmin, host]
+              get_param: [EndpointMap, GnocchiAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, HeatApiNetwork]
+                - get_param: [ServiceNetMap, GnocchiApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, HeatApiNetwork]
+                        get_param: [ServiceNetMap, GnocchiApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, HeatCfnAdmin, host]
+              get_param: [EndpointMap, GnocchiAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, HeatApiNetwork]
+                - get_param: [ServiceNetMap, GnocchiApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, HeatApiNetwork]
+                - get_param: [ServiceNetMap, GnocchiApiNetwork]
         port:
-          get_param: [EndpointMap, HeatCfnAdmin, port]
+          get_param: [EndpointMap, GnocchiAdmin, port]
         protocol:
-          get_param: [EndpointMap, HeatCfnAdmin, protocol]
+          get_param: [EndpointMap, GnocchiAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, HeatCfnAdmin, protocol]
+          - - get_param: [EndpointMap, GnocchiAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, HeatCfnAdmin, host]
+                  get_param: [EndpointMap, GnocchiAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, HeatApiNetwork]
+                    - get_param: [ServiceNetMap, GnocchiApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, HeatApiNetwork]
+                            get_param: [ServiceNetMap, GnocchiApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, HeatCfnAdmin, port]
-            - /v1
+            - get_param: [EndpointMap, GnocchiAdmin, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, HeatCfnAdmin, protocol]
+          - - get_param: [EndpointMap, GnocchiAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, HeatCfnAdmin, host]
+                  get_param: [EndpointMap, GnocchiAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, HeatApiNetwork]
+                    - get_param: [ServiceNetMap, GnocchiApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, HeatApiNetwork]
+                            get_param: [ServiceNetMap, GnocchiApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, HeatCfnAdmin, port]
-      HeatCfnInternal:
+            - get_param: [EndpointMap, GnocchiAdmin, port]
+      GnocchiInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, HeatCfnInternal, host]
+              get_param: [EndpointMap, GnocchiInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, HeatApiNetwork]
+                - get_param: [ServiceNetMap, GnocchiApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, HeatApiNetwork]
+                        get_param: [ServiceNetMap, GnocchiApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, HeatCfnInternal, host]
+              get_param: [EndpointMap, GnocchiInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, HeatApiNetwork]
+                - get_param: [ServiceNetMap, GnocchiApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, HeatApiNetwork]
+                - get_param: [ServiceNetMap, GnocchiApiNetwork]
         port:
-          get_param: [EndpointMap, HeatCfnInternal, port]
+          get_param: [EndpointMap, GnocchiInternal, port]
         protocol:
-          get_param: [EndpointMap, HeatCfnInternal, protocol]
+          get_param: [EndpointMap, GnocchiInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, HeatCfnInternal, protocol]
+          - - get_param: [EndpointMap, GnocchiInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, HeatCfnInternal, host]
+                  get_param: [EndpointMap, GnocchiInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, HeatApiNetwork]
+                    - get_param: [ServiceNetMap, GnocchiApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, HeatApiNetwork]
+                            get_param: [ServiceNetMap, GnocchiApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, HeatCfnInternal, port]
-            - /v1
+            - get_param: [EndpointMap, GnocchiInternal, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, HeatCfnInternal, protocol]
+          - - get_param: [EndpointMap, GnocchiInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, HeatCfnInternal, host]
+                  get_param: [EndpointMap, GnocchiInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, HeatApiNetwork]
+                    - get_param: [ServiceNetMap, GnocchiApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, HeatApiNetwork]
+                            get_param: [ServiceNetMap, GnocchiApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, HeatCfnInternal, port]
-      HeatCfnPublic:
+            - get_param: [EndpointMap, GnocchiInternal, port]
+      GnocchiPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, HeatCfnPublic, host]
+              get_param: [EndpointMap, GnocchiPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -2299,7 +2315,7 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, HeatCfnPublic, host]
+              get_param: [EndpointMap, GnocchiPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -2310,17 +2326,17 @@ outputs:
                 - NetIpMap
                 - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, HeatCfnPublic, port]
+          get_param: [EndpointMap, GnocchiPublic, port]
         protocol:
-          get_param: [EndpointMap, HeatCfnPublic, protocol]
+          get_param: [EndpointMap, GnocchiPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, HeatCfnPublic, protocol]
+          - - get_param: [EndpointMap, GnocchiPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, HeatCfnPublic, host]
+                  get_param: [EndpointMap, GnocchiPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
@@ -2335,16 +2351,15 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, HeatCfnPublic, port]
-            - /v1
+            - get_param: [EndpointMap, GnocchiPublic, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, HeatCfnPublic, protocol]
+          - - get_param: [EndpointMap, GnocchiPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, HeatCfnPublic, host]
+                  get_param: [EndpointMap, GnocchiPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
@@ -2359,1078 +2374,1078 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, HeatCfnPublic, port]
-      HorizonPublic:
+            - get_param: [EndpointMap, GnocchiPublic, port]
+      HeatAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, HorizonPublic, host]
+              get_param: [EndpointMap, HeatAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, HeatApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, PublicNetwork]
+                        get_param: [ServiceNetMap, HeatApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, HorizonPublic, host]
+              get_param: [EndpointMap, HeatAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, HeatApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, HeatApiNetwork]
         port:
-          get_param: [EndpointMap, HorizonPublic, port]
+          get_param: [EndpointMap, HeatAdmin, port]
         protocol:
-          get_param: [EndpointMap, HorizonPublic, protocol]
+          get_param: [EndpointMap, HeatAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, HorizonPublic, protocol]
+          - - get_param: [EndpointMap, HeatAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, HorizonPublic, host]
+                  get_param: [EndpointMap, HeatAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, PublicNetwork]
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, PublicNetwork]
+                            get_param: [ServiceNetMap, HeatApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, HorizonPublic, port]
-            - /dashboard
+            - get_param: [EndpointMap, HeatAdmin, port]
+            - /v1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, HorizonPublic, protocol]
+          - - get_param: [EndpointMap, HeatAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, HorizonPublic, host]
+                  get_param: [EndpointMap, HeatAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, PublicNetwork]
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, PublicNetwork]
+                            get_param: [ServiceNetMap, HeatApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, HorizonPublic, port]
-      IronicAdmin:
+            - get_param: [EndpointMap, HeatAdmin, port]
+      HeatInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, IronicAdmin, host]
+              get_param: [EndpointMap, HeatInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, IronicApiNetwork]
+                - get_param: [ServiceNetMap, HeatApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, IronicApiNetwork]
+                        get_param: [ServiceNetMap, HeatApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, IronicAdmin, host]
+              get_param: [EndpointMap, HeatInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, IronicApiNetwork]
+                - get_param: [ServiceNetMap, HeatApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, IronicApiNetwork]
+                - get_param: [ServiceNetMap, HeatApiNetwork]
         port:
-          get_param: [EndpointMap, IronicAdmin, port]
+          get_param: [EndpointMap, HeatInternal, port]
         protocol:
-          get_param: [EndpointMap, IronicAdmin, protocol]
+          get_param: [EndpointMap, HeatInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, IronicAdmin, protocol]
+          - - get_param: [EndpointMap, HeatInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, IronicAdmin, host]
+                  get_param: [EndpointMap, HeatInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, IronicApiNetwork]
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, IronicApiNetwork]
+                            get_param: [ServiceNetMap, HeatApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, IronicAdmin, port]
-            - /v1
+            - get_param: [EndpointMap, HeatInternal, port]
+            - /v1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, IronicAdmin, protocol]
+          - - get_param: [EndpointMap, HeatInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, IronicAdmin, host]
+                  get_param: [EndpointMap, HeatInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, IronicApiNetwork]
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, IronicApiNetwork]
+                            get_param: [ServiceNetMap, HeatApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, IronicAdmin, port]
-      IronicInternal:
+            - get_param: [EndpointMap, HeatInternal, port]
+      HeatPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, IronicInternal, host]
+              get_param: [EndpointMap, HeatPublic, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, IronicApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, IronicApiNetwork]
+                        get_param: [ServiceNetMap, PublicNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, IronicInternal, host]
+              get_param: [EndpointMap, HeatPublic, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, IronicApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, IronicApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, IronicInternal, port]
+          get_param: [EndpointMap, HeatPublic, port]
         protocol:
-          get_param: [EndpointMap, IronicInternal, protocol]
+          get_param: [EndpointMap, HeatPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, IronicInternal, protocol]
+          - - get_param: [EndpointMap, HeatPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, IronicInternal, host]
+                  get_param: [EndpointMap, HeatPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, IronicApiNetwork]
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, IronicApiNetwork]
+                            get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, IronicInternal, port]
-            - /v1
+            - get_param: [EndpointMap, HeatPublic, port]
+            - /v1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, IronicInternal, protocol]
+          - - get_param: [EndpointMap, HeatPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, IronicInternal, host]
+                  get_param: [EndpointMap, HeatPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, IronicApiNetwork]
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, IronicApiNetwork]
+                            get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, IronicInternal, port]
-      IronicPublic:
+            - get_param: [EndpointMap, HeatPublic, port]
+      HeatCfnAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, IronicPublic, host]
+              get_param: [EndpointMap, HeatCfnAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, HeatApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, PublicNetwork]
+                        get_param: [ServiceNetMap, HeatApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, IronicPublic, host]
+              get_param: [EndpointMap, HeatCfnAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, HeatApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, HeatApiNetwork]
         port:
-          get_param: [EndpointMap, IronicPublic, port]
+          get_param: [EndpointMap, HeatCfnAdmin, port]
         protocol:
-          get_param: [EndpointMap, IronicPublic, protocol]
+          get_param: [EndpointMap, HeatCfnAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, IronicPublic, protocol]
+          - - get_param: [EndpointMap, HeatCfnAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, IronicPublic, host]
+                  get_param: [EndpointMap, HeatCfnAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, PublicNetwork]
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, PublicNetwork]
+                            get_param: [ServiceNetMap, HeatApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, IronicPublic, port]
+            - get_param: [EndpointMap, HeatCfnAdmin, port]
             - /v1
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, IronicPublic, protocol]
+          - - get_param: [EndpointMap, HeatCfnAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, IronicPublic, host]
+                  get_param: [EndpointMap, HeatCfnAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, PublicNetwork]
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, PublicNetwork]
+                            get_param: [ServiceNetMap, HeatApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, IronicPublic, port]
-      KeystoneAdmin:
+            - get_param: [EndpointMap, HeatCfnAdmin, port]
+      HeatCfnInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneAdmin, host]
+              get_param: [EndpointMap, HeatCfnInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                - get_param: [ServiceNetMap, HeatApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                        get_param: [ServiceNetMap, HeatApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneAdmin, host]
+              get_param: [EndpointMap, HeatCfnInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                - get_param: [ServiceNetMap, HeatApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                - get_param: [ServiceNetMap, HeatApiNetwork]
         port:
-          get_param: [EndpointMap, KeystoneAdmin, port]
+          get_param: [EndpointMap, HeatCfnInternal, port]
         protocol:
-          get_param: [EndpointMap, KeystoneAdmin, protocol]
+          get_param: [EndpointMap, HeatCfnInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneAdmin, protocol]
+          - - get_param: [EndpointMap, HeatCfnInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneAdmin, host]
+                  get_param: [EndpointMap, HeatCfnInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                            get_param: [ServiceNetMap, HeatApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystoneAdmin, port]
-            - /v2.0
+            - get_param: [EndpointMap, HeatCfnInternal, port]
+            - /v1
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneAdmin, protocol]
+          - - get_param: [EndpointMap, HeatCfnInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneAdmin, host]
+                  get_param: [EndpointMap, HeatCfnInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                            get_param: [ServiceNetMap, HeatApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystoneAdmin, port]
-      KeystoneEC2:
+            - get_param: [EndpointMap, HeatCfnInternal, port]
+      HeatCfnPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneInternal, host]
+              get_param: [EndpointMap, HeatCfnPublic, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                        get_param: [ServiceNetMap, PublicNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneInternal, host]
+              get_param: [EndpointMap, HeatCfnPublic, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, KeystoneInternal, port]
+          get_param: [EndpointMap, HeatCfnPublic, port]
         protocol:
-          get_param: [EndpointMap, KeystoneInternal, protocol]
+          get_param: [EndpointMap, HeatCfnPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneInternal, protocol]
+          - - get_param: [EndpointMap, HeatCfnPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneInternal, host]
+                  get_param: [EndpointMap, HeatCfnPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                            get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystoneInternal, port]
-            - /v2.0/ec2tokens
+            - get_param: [EndpointMap, HeatCfnPublic, port]
+            - /v1
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneInternal, protocol]
+          - - get_param: [EndpointMap, HeatCfnPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneInternal, host]
+                  get_param: [EndpointMap, HeatCfnPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                            get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystoneInternal, port]
-      KeystoneInternal:
+            - get_param: [EndpointMap, HeatCfnPublic, port]
+      HorizonPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneInternal, host]
+              get_param: [EndpointMap, HorizonPublic, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                        get_param: [ServiceNetMap, PublicNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneInternal, host]
+              get_param: [EndpointMap, HorizonPublic, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, KeystoneInternal, port]
+          get_param: [EndpointMap, HorizonPublic, port]
         protocol:
-          get_param: [EndpointMap, KeystoneInternal, protocol]
+          get_param: [EndpointMap, HorizonPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneInternal, protocol]
+          - - get_param: [EndpointMap, HorizonPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneInternal, host]
+                  get_param: [EndpointMap, HorizonPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                            get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystoneInternal, port]
-            - /v2.0
+            - get_param: [EndpointMap, HorizonPublic, port]
+            - /dashboard
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneInternal, protocol]
+          - - get_param: [EndpointMap, HorizonPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneInternal, host]
+                  get_param: [EndpointMap, HorizonPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                            get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystoneInternal, port]
-      KeystonePublic:
+            - get_param: [EndpointMap, HorizonPublic, port]
+      IronicAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystonePublic, host]
+              get_param: [EndpointMap, IronicAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, IronicApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, PublicNetwork]
+                        get_param: [ServiceNetMap, IronicApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystonePublic, host]
+              get_param: [EndpointMap, IronicAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, IronicApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, IronicApiNetwork]
         port:
-          get_param: [EndpointMap, KeystonePublic, port]
+          get_param: [EndpointMap, IronicAdmin, port]
         protocol:
-          get_param: [EndpointMap, KeystonePublic, protocol]
+          get_param: [EndpointMap, IronicAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystonePublic, protocol]
+          - - get_param: [EndpointMap, IronicAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystonePublic, host]
+                  get_param: [EndpointMap, IronicAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, PublicNetwork]
+                    - get_param: [ServiceNetMap, IronicApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, PublicNetwork]
+                            get_param: [ServiceNetMap, IronicApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystonePublic, port]
-            - /v2.0
+            - get_param: [EndpointMap, IronicAdmin, port]
+            - /v1
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystonePublic, protocol]
+          - - get_param: [EndpointMap, IronicAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystonePublic, host]
+                  get_param: [EndpointMap, IronicAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, PublicNetwork]
+                    - get_param: [ServiceNetMap, IronicApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, PublicNetwork]
+                            get_param: [ServiceNetMap, IronicApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystonePublic, port]
-      KeystoneV3Admin:
+            - get_param: [EndpointMap, IronicAdmin, port]
+      IronicInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneAdmin, host]
+              get_param: [EndpointMap, IronicInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                - get_param: [ServiceNetMap, IronicApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                        get_param: [ServiceNetMap, IronicApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneAdmin, host]
+              get_param: [EndpointMap, IronicInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                - get_param: [ServiceNetMap, IronicApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                - get_param: [ServiceNetMap, IronicApiNetwork]
         port:
-          get_param: [EndpointMap, KeystoneAdmin, port]
+          get_param: [EndpointMap, IronicInternal, port]
         protocol:
-          get_param: [EndpointMap, KeystoneAdmin, protocol]
+          get_param: [EndpointMap, IronicInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneAdmin, protocol]
+          - - get_param: [EndpointMap, IronicInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneAdmin, host]
+                  get_param: [EndpointMap, IronicInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                    - get_param: [ServiceNetMap, IronicApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                            get_param: [ServiceNetMap, IronicApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystoneAdmin, port]
-            - /v3
+            - get_param: [EndpointMap, IronicInternal, port]
+            - /v1
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneAdmin, protocol]
+          - - get_param: [EndpointMap, IronicInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneAdmin, host]
+                  get_param: [EndpointMap, IronicInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                    - get_param: [ServiceNetMap, IronicApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
+                            get_param: [ServiceNetMap, IronicApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystoneAdmin, port]
-      KeystoneV3Internal:
+            - get_param: [EndpointMap, IronicInternal, port]
+      IronicPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneInternal, host]
+              get_param: [EndpointMap, IronicPublic, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                        get_param: [ServiceNetMap, PublicNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneInternal, host]
+              get_param: [EndpointMap, IronicPublic, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, KeystoneInternal, port]
+          get_param: [EndpointMap, IronicPublic, port]
         protocol:
-          get_param: [EndpointMap, KeystoneInternal, protocol]
+          get_param: [EndpointMap, IronicPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneInternal, protocol]
+          - - get_param: [EndpointMap, IronicPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneInternal, host]
+                  get_param: [EndpointMap, IronicPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                            get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystoneInternal, port]
-            - /v3
+            - get_param: [EndpointMap, IronicPublic, port]
+            - /v1
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneInternal, protocol]
+          - - get_param: [EndpointMap, IronicPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneInternal, host]
+                  get_param: [EndpointMap, IronicPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                            get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystoneInternal, port]
-      KeystoneV3Public:
+            - get_param: [EndpointMap, IronicPublic, port]
+      KeystoneAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystonePublic, host]
+              get_param: [EndpointMap, KeystoneAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, PublicNetwork]
+                        get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystonePublic, host]
+              get_param: [EndpointMap, KeystoneAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, PublicNetwork]
+                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
         port:
-          get_param: [EndpointMap, KeystonePublic, port]
+          get_param: [EndpointMap, KeystoneAdmin, port]
         protocol:
-          get_param: [EndpointMap, KeystonePublic, protocol]
+          get_param: [EndpointMap, KeystoneAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystonePublic, protocol]
+          - - get_param: [EndpointMap, KeystoneAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystonePublic, host]
+                  get_param: [EndpointMap, KeystoneAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, PublicNetwork]
+                    - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, PublicNetwork]
+                            get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystonePublic, port]
-            - /v3
+            - get_param: [EndpointMap, KeystoneAdmin, port]
+            - /v2.0
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystonePublic, protocol]
+          - - get_param: [EndpointMap, KeystoneAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystonePublic, host]
+                  get_param: [EndpointMap, KeystoneAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, PublicNetwork]
+                    - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, PublicNetwork]
+                            get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, KeystonePublic, port]
-      ManilaAdmin:
+            - get_param: [EndpointMap, KeystoneAdmin, port]
+      KeystoneEC2:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, ManilaAdmin, host]
+              get_param: [EndpointMap, KeystoneInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, ManilaApiNetwork]
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, ManilaApiNetwork]
+                        get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, ManilaAdmin, host]
+              get_param: [EndpointMap, KeystoneInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, ManilaApiNetwork]
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, ManilaApiNetwork]
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
         port:
-          get_param: [EndpointMap, ManilaAdmin, port]
+          get_param: [EndpointMap, KeystoneInternal, port]
         protocol:
-          get_param: [EndpointMap, ManilaAdmin, protocol]
+          get_param: [EndpointMap, KeystoneInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, ManilaAdmin, protocol]
+          - - get_param: [EndpointMap, KeystoneInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, ManilaAdmin, host]
+                  get_param: [EndpointMap, KeystoneInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, ManilaApiNetwork]
+                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, ManilaApiNetwork]
+                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, ManilaAdmin, port]
-            - /v2/%(tenant_id)s
+            - get_param: [EndpointMap, KeystoneInternal, port]
+            - /v2.0/ec2tokens
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, ManilaAdmin, protocol]
+          - - get_param: [EndpointMap, KeystoneInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, ManilaAdmin, host]
+                  get_param: [EndpointMap, KeystoneInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, ManilaApiNetwork]
+                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, ManilaApiNetwork]
+                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, ManilaAdmin, port]
-      ManilaInternal:
+            - get_param: [EndpointMap, KeystoneInternal, port]
+      KeystoneInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, ManilaInternal, host]
+              get_param: [EndpointMap, KeystoneInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, ManilaApiNetwork]
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, ManilaApiNetwork]
+                        get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, ManilaInternal, host]
+              get_param: [EndpointMap, KeystoneInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, ManilaApiNetwork]
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, ManilaApiNetwork]
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
         port:
-          get_param: [EndpointMap, ManilaInternal, port]
+          get_param: [EndpointMap, KeystoneInternal, port]
         protocol:
-          get_param: [EndpointMap, ManilaInternal, protocol]
+          get_param: [EndpointMap, KeystoneInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, ManilaInternal, protocol]
+          - - get_param: [EndpointMap, KeystoneInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, ManilaInternal, host]
+                  get_param: [EndpointMap, KeystoneInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, ManilaApiNetwork]
+                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, ManilaApiNetwork]
+                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, ManilaInternal, port]
-            - /v2/%(tenant_id)s
+            - get_param: [EndpointMap, KeystoneInternal, port]
+            - /v2.0
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, ManilaInternal, protocol]
+          - - get_param: [EndpointMap, KeystoneInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, ManilaInternal, host]
+                  get_param: [EndpointMap, KeystoneInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, ManilaApiNetwork]
+                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, ManilaApiNetwork]
+                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, ManilaInternal, port]
-      ManilaPublic:
+            - get_param: [EndpointMap, KeystoneInternal, port]
+      KeystonePublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, ManilaPublic, host]
+              get_param: [EndpointMap, KeystonePublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -3447,7 +3462,7 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, ManilaPublic, host]
+              get_param: [EndpointMap, KeystonePublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -3458,17 +3473,17 @@ outputs:
                 - NetIpMap
                 - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, ManilaPublic, port]
+          get_param: [EndpointMap, KeystonePublic, port]
         protocol:
-          get_param: [EndpointMap, ManilaPublic, protocol]
+          get_param: [EndpointMap, KeystonePublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, ManilaPublic, protocol]
+          - - get_param: [EndpointMap, KeystonePublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, ManilaPublic, host]
+                  get_param: [EndpointMap, KeystonePublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
@@ -3483,16 +3498,16 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, ManilaPublic, port]
-            - /v2/%(tenant_id)s
+            - get_param: [EndpointMap, KeystonePublic, port]
+            - /v2.0
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, ManilaPublic, protocol]
+          - - get_param: [EndpointMap, KeystonePublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, ManilaPublic, host]
+                  get_param: [EndpointMap, KeystonePublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
@@ -3507,111 +3522,357 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, ManilaPublic, port]
-      ManilaV1Admin:
+            - get_param: [EndpointMap, KeystonePublic, port]
+      KeystoneV3Admin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, ManilaAdmin, host]
+              get_param: [EndpointMap, KeystoneAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, ManilaApiNetwork]
+                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, ManilaApiNetwork]
+                        get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, ManilaAdmin, host]
+              get_param: [EndpointMap, KeystoneAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, ManilaApiNetwork]
+                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, ManilaApiNetwork]
+                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
         port:
-          get_param: [EndpointMap, ManilaAdmin, port]
+          get_param: [EndpointMap, KeystoneAdmin, port]
         protocol:
-          get_param: [EndpointMap, ManilaAdmin, protocol]
+          get_param: [EndpointMap, KeystoneAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, ManilaAdmin, protocol]
+          - - get_param: [EndpointMap, KeystoneAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, ManilaAdmin, host]
+                  get_param: [EndpointMap, KeystoneAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, ManilaApiNetwork]
+                    - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, ManilaApiNetwork]
+                            get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, ManilaAdmin, port]
-            - /v1/%(tenant_id)s
+            - get_param: [EndpointMap, KeystoneAdmin, port]
+            - /v3
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, ManilaAdmin, protocol]
+          - - get_param: [EndpointMap, KeystoneAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, ManilaAdmin, host]
+                  get_param: [EndpointMap, KeystoneAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, ManilaApiNetwork]
+                    - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, ManilaApiNetwork]
+                            get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, ManilaAdmin, port]
-      ManilaV1Internal:
+            - get_param: [EndpointMap, KeystoneAdmin, port]
+      KeystoneV3Internal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, ManilaInternal, host]
+              get_param: [EndpointMap, KeystoneInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, ManilaApiNetwork]
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, ManilaApiNetwork]
+                        get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, ManilaInternal, host]
+              get_param: [EndpointMap, KeystoneInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+        port:
+          get_param: [EndpointMap, KeystoneInternal, port]
+        protocol:
+          get_param: [EndpointMap, KeystoneInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, KeystoneInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, KeystoneInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, KeystoneInternal, port]
+            - /v3
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, KeystoneInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, KeystoneInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, KeystonePublicApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, KeystoneInternal, port]
+      KeystoneV3Public:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, KeystonePublic, 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, KeystonePublic, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, PublicNetwork]
+        port:
+          get_param: [EndpointMap, KeystonePublic, port]
+        protocol:
+          get_param: [EndpointMap, KeystonePublic, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, KeystonePublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, KeystonePublic, 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, KeystonePublic, port]
+            - /v3
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, KeystonePublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, KeystonePublic, 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, KeystonePublic, port]
+      ManilaAdmin:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, ManilaAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, ManilaApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, ManilaAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
+        port:
+          get_param: [EndpointMap, ManilaAdmin, port]
+        protocol:
+          get_param: [EndpointMap, ManilaAdmin, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, ManilaAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, ManilaAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, ManilaApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, ManilaAdmin, port]
+            - /v2/%(tenant_id)s
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, ManilaAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, ManilaAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, ManilaApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, ManilaAdmin, port]
+      ManilaInternal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, ManilaInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, ManilaApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, ManilaInternal, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -3648,7 +3909,7 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, ManilaInternal, port]
-            - /v1/%(tenant_id)s
+            - /v2/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
@@ -3672,7 +3933,7 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, ManilaInternal, port]
-      ManilaV1Public:
+      ManilaPublic:
         host:
           str_replace:
             template:
@@ -3714,294 +3975,1518 @@ outputs:
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, ManilaPublic, host]
+                  get_param: [EndpointMap, ManilaPublic, 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, ManilaPublic, port]
+            - /v2/%(tenant_id)s
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, ManilaPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, ManilaPublic, 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, ManilaPublic, port]
+      ManilaV1Admin:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, ManilaAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, ManilaApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, ManilaAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
+        port:
+          get_param: [EndpointMap, ManilaAdmin, port]
+        protocol:
+          get_param: [EndpointMap, ManilaAdmin, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, ManilaAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, ManilaAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, ManilaApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, ManilaAdmin, port]
+            - /v1/%(tenant_id)s
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, ManilaAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, ManilaAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, ManilaApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, ManilaAdmin, port]
+      ManilaV1Internal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, ManilaInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, ManilaApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, ManilaInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
+        port:
+          get_param: [EndpointMap, ManilaInternal, port]
+        protocol:
+          get_param: [EndpointMap, ManilaInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, ManilaInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, ManilaInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, ManilaApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, ManilaInternal, port]
+            - /v1/%(tenant_id)s
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, ManilaInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, ManilaInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, ManilaApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, ManilaInternal, port]
+      ManilaV1Public:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, ManilaPublic, 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, ManilaPublic, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, PublicNetwork]
+        port:
+          get_param: [EndpointMap, ManilaPublic, port]
+        protocol:
+          get_param: [EndpointMap, ManilaPublic, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, ManilaPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, ManilaPublic, 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, ManilaPublic, port]
+            - /v1/%(tenant_id)s
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, ManilaPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, ManilaPublic, 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, ManilaPublic, port]
+      MistralAdmin:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, MistralAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, MistralApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, MistralApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, MistralAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, MistralApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, MistralApiNetwork]
+        port:
+          get_param: [EndpointMap, MistralAdmin, port]
+        protocol:
+          get_param: [EndpointMap, MistralAdmin, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, MistralAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, MistralAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, MistralApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, MistralApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, MistralAdmin, port]
+            - /v2
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, MistralAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, MistralAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, MistralApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, MistralApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, MistralAdmin, port]
+      MistralInternal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, MistralInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, MistralApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, MistralApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, MistralInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, MistralApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, MistralApiNetwork]
+        port:
+          get_param: [EndpointMap, MistralInternal, port]
+        protocol:
+          get_param: [EndpointMap, MistralInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, MistralInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, MistralInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, MistralApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, MistralApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, MistralInternal, port]
+            - /v2
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, MistralInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, MistralInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, MistralApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, MistralApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, MistralInternal, port]
+      MistralPublic:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, MistralPublic, 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, MistralPublic, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, PublicNetwork]
+        port:
+          get_param: [EndpointMap, MistralPublic, port]
+        protocol:
+          get_param: [EndpointMap, MistralPublic, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, MistralPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, MistralPublic, 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, MistralPublic, port]
+            - /v2
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, MistralPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, MistralPublic, 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, MistralPublic, port]
+      MysqlInternal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, MysqlInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, MysqlNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, MysqlNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, MysqlInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, MysqlNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, MysqlNetwork]
+        port:
+          get_param: [EndpointMap, MysqlInternal, port]
+        protocol:
+          get_param: [EndpointMap, MysqlInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, MysqlInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, MysqlInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, MysqlNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, MysqlNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, MysqlInternal, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, MysqlInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, MysqlInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, MysqlNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, MysqlNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, MysqlInternal, port]
+      NeutronAdmin:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, NeutronAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NeutronApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, NeutronApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, NeutronAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NeutronApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, NeutronApiNetwork]
+        port:
+          get_param: [EndpointMap, NeutronAdmin, port]
+        protocol:
+          get_param: [EndpointMap, NeutronAdmin, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, NeutronAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, NeutronAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NeutronApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, NeutronApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, NeutronAdmin, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, NeutronAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, NeutronAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NeutronApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, NeutronApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, NeutronAdmin, port]
+      NeutronInternal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, NeutronInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NeutronApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, NeutronApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, NeutronInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NeutronApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, NeutronApiNetwork]
+        port:
+          get_param: [EndpointMap, NeutronInternal, port]
+        protocol:
+          get_param: [EndpointMap, NeutronInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, NeutronInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, NeutronInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NeutronApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, NeutronApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, NeutronInternal, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, NeutronInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, NeutronInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NeutronApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, NeutronApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, NeutronInternal, port]
+      NeutronPublic:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, NeutronPublic, 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, NeutronPublic, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, PublicNetwork]
+        port:
+          get_param: [EndpointMap, NeutronPublic, port]
+        protocol:
+          get_param: [EndpointMap, NeutronPublic, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, NeutronPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, NeutronPublic, 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, NeutronPublic, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, NeutronPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, NeutronPublic, 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, NeutronPublic, port]
+      NovaAdmin:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, NovaAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, NovaApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, NovaAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, NovaApiNetwork]
+        port:
+          get_param: [EndpointMap, NovaAdmin, port]
+        protocol:
+          get_param: [EndpointMap, NovaAdmin, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, NovaAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, NovaAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, NovaApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, NovaAdmin, port]
+            - /v2.1
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, NovaAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, NovaAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, NovaApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, NovaAdmin, port]
+      NovaInternal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, NovaInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, NovaApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, NovaInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, NovaApiNetwork]
+        port:
+          get_param: [EndpointMap, NovaInternal, port]
+        protocol:
+          get_param: [EndpointMap, NovaInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, NovaInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, NovaInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, NovaApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, NovaInternal, port]
+            - /v2.1
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, NovaInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, NovaInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, NovaApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, NovaInternal, port]
+      NovaPublic:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, NovaPublic, 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, NovaPublic, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, PublicNetwork]
+        port:
+          get_param: [EndpointMap, NovaPublic, port]
+        protocol:
+          get_param: [EndpointMap, NovaPublic, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, NovaPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, NovaPublic, 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, NovaPublic, port]
+            - /v2.1
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, NovaPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, NovaPublic, 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, NovaPublic, port]
+      NovaVNCProxyAdmin:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, NovaVNCProxyAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, NovaApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, NovaVNCProxyAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, NovaApiNetwork]
+        port:
+          get_param: [EndpointMap, NovaVNCProxyAdmin, port]
+        protocol:
+          get_param: [EndpointMap, NovaVNCProxyAdmin, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, NovaVNCProxyAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, NovaVNCProxyAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, NovaApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, NovaVNCProxyAdmin, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, NovaVNCProxyAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, NovaVNCProxyAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, NovaApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, NovaVNCProxyAdmin, port]
+      NovaVNCProxyInternal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, NovaVNCProxyInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, NovaApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, NovaVNCProxyInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, NovaApiNetwork]
+        port:
+          get_param: [EndpointMap, NovaVNCProxyInternal, port]
+        protocol:
+          get_param: [EndpointMap, NovaVNCProxyInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, NovaVNCProxyInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, NovaVNCProxyInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, PublicNetwork]
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, PublicNetwork]
+                            get_param: [ServiceNetMap, NovaApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, ManilaPublic, port]
-            - /v1/%(tenant_id)s
+            - get_param: [EndpointMap, NovaVNCProxyInternal, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, ManilaPublic, protocol]
+          - - get_param: [EndpointMap, NovaVNCProxyInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, ManilaPublic, host]
+                  get_param: [EndpointMap, NovaVNCProxyInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, PublicNetwork]
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, PublicNetwork]
+                            get_param: [ServiceNetMap, NovaApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, ManilaPublic, port]
-      MysqlInternal:
+            - get_param: [EndpointMap, NovaVNCProxyInternal, port]
+      NovaVNCProxyPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, MysqlInternal, host]
+              get_param: [EndpointMap, NovaVNCProxyPublic, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, MysqlNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, MysqlNetwork]
+                        get_param: [ServiceNetMap, PublicNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, MysqlInternal, host]
+              get_param: [EndpointMap, NovaVNCProxyPublic, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, MysqlNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, MysqlNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, MysqlInternal, port]
+          get_param: [EndpointMap, NovaVNCProxyPublic, port]
         protocol:
-          get_param: [EndpointMap, MysqlInternal, protocol]
+          get_param: [EndpointMap, NovaVNCProxyPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, MysqlInternal, protocol]
+          - - get_param: [EndpointMap, NovaVNCProxyPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, MysqlInternal, host]
+                  get_param: [EndpointMap, NovaVNCProxyPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, MysqlNetwork]
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, MysqlNetwork]
+                            get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, MysqlInternal, port]
+            - get_param: [EndpointMap, NovaVNCProxyPublic, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, MysqlInternal, protocol]
+          - - get_param: [EndpointMap, NovaVNCProxyPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, MysqlInternal, host]
+                  get_param: [EndpointMap, NovaVNCProxyPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, MysqlNetwork]
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, MysqlNetwork]
+                            get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, MysqlInternal, port]
-      NeutronAdmin:
+            - get_param: [EndpointMap, NovaVNCProxyPublic, port]
+      PankoAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NeutronAdmin, host]
+              get_param: [EndpointMap, PankoAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NeutronApiNetwork]
+                - get_param: [ServiceNetMap, PankoApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, NeutronApiNetwork]
+                        get_param: [ServiceNetMap, PankoApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, NeutronAdmin, host]
+              get_param: [EndpointMap, PankoAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NeutronApiNetwork]
+                - get_param: [ServiceNetMap, PankoApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, NeutronApiNetwork]
+                - get_param: [ServiceNetMap, PankoApiNetwork]
         port:
-          get_param: [EndpointMap, NeutronAdmin, port]
+          get_param: [EndpointMap, PankoAdmin, port]
         protocol:
-          get_param: [EndpointMap, NeutronAdmin, protocol]
+          get_param: [EndpointMap, PankoAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NeutronAdmin, protocol]
+          - - get_param: [EndpointMap, PankoAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NeutronAdmin, host]
+                  get_param: [EndpointMap, PankoAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NeutronApiNetwork]
+                    - get_param: [ServiceNetMap, PankoApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NeutronApiNetwork]
+                            get_param: [ServiceNetMap, PankoApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NeutronAdmin, port]
+            - get_param: [EndpointMap, PankoAdmin, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NeutronAdmin, protocol]
+          - - get_param: [EndpointMap, PankoAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NeutronAdmin, host]
+                  get_param: [EndpointMap, PankoAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NeutronApiNetwork]
+                    - get_param: [ServiceNetMap, PankoApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NeutronApiNetwork]
+                            get_param: [ServiceNetMap, PankoApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NeutronAdmin, port]
-      NeutronInternal:
+            - get_param: [EndpointMap, PankoAdmin, port]
+      PankoInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NeutronInternal, host]
+              get_param: [EndpointMap, PankoInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NeutronApiNetwork]
+                - get_param: [ServiceNetMap, PankoApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, NeutronApiNetwork]
+                        get_param: [ServiceNetMap, PankoApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, NeutronInternal, host]
+              get_param: [EndpointMap, PankoInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NeutronApiNetwork]
+                - get_param: [ServiceNetMap, PankoApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, NeutronApiNetwork]
+                - get_param: [ServiceNetMap, PankoApiNetwork]
         port:
-          get_param: [EndpointMap, NeutronInternal, port]
+          get_param: [EndpointMap, PankoInternal, port]
         protocol:
-          get_param: [EndpointMap, NeutronInternal, protocol]
+          get_param: [EndpointMap, PankoInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NeutronInternal, protocol]
+          - - get_param: [EndpointMap, PankoInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NeutronInternal, host]
+                  get_param: [EndpointMap, PankoInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NeutronApiNetwork]
+                    - get_param: [ServiceNetMap, PankoApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NeutronApiNetwork]
+                            get_param: [ServiceNetMap, PankoApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NeutronInternal, port]
+            - get_param: [EndpointMap, PankoInternal, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NeutronInternal, protocol]
+          - - get_param: [EndpointMap, PankoInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NeutronInternal, host]
+                  get_param: [EndpointMap, PankoInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NeutronApiNetwork]
+                    - get_param: [ServiceNetMap, PankoApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NeutronApiNetwork]
+                            get_param: [ServiceNetMap, PankoApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NeutronInternal, port]
-      NeutronPublic:
+            - get_param: [EndpointMap, PankoInternal, port]
+      PankoPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NeutronPublic, host]
+              get_param: [EndpointMap, PankoPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -4018,7 +5503,7 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, NeutronPublic, host]
+              get_param: [EndpointMap, PankoPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -4029,17 +5514,17 @@ outputs:
                 - NetIpMap
                 - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, NeutronPublic, port]
+          get_param: [EndpointMap, PankoPublic, port]
         protocol:
-          get_param: [EndpointMap, NeutronPublic, protocol]
+          get_param: [EndpointMap, PankoPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NeutronPublic, protocol]
+          - - get_param: [EndpointMap, PankoPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NeutronPublic, host]
+                  get_param: [EndpointMap, PankoPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
@@ -4054,15 +5539,15 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NeutronPublic, port]
+            - get_param: [EndpointMap, PankoPublic, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NeutronPublic, protocol]
+          - - get_param: [EndpointMap, PankoPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NeutronPublic, host]
+                  get_param: [EndpointMap, PankoPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
@@ -4077,176 +5562,176 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NeutronPublic, port]
-      NovaAdmin:
+            - get_param: [EndpointMap, PankoPublic, port]
+      SaharaAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaAdmin, host]
+              get_param: [EndpointMap, SaharaAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NovaApiNetwork]
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, NovaApiNetwork]
+                        get_param: [ServiceNetMap, SaharaApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaAdmin, host]
+              get_param: [EndpointMap, SaharaAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NovaApiNetwork]
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, NovaApiNetwork]
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
         port:
-          get_param: [EndpointMap, NovaAdmin, port]
+          get_param: [EndpointMap, SaharaAdmin, port]
         protocol:
-          get_param: [EndpointMap, NovaAdmin, protocol]
+          get_param: [EndpointMap, SaharaAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaAdmin, protocol]
+          - - get_param: [EndpointMap, SaharaAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaAdmin, host]
+                  get_param: [EndpointMap, SaharaAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NovaApiNetwork]
+                    - get_param: [ServiceNetMap, SaharaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NovaApiNetwork]
+                            get_param: [ServiceNetMap, SaharaApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NovaAdmin, port]
-            - /v2.1
+            - get_param: [EndpointMap, SaharaAdmin, port]
+            - /v1.1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaAdmin, protocol]
+          - - get_param: [EndpointMap, SaharaAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaAdmin, host]
+                  get_param: [EndpointMap, SaharaAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NovaApiNetwork]
+                    - get_param: [ServiceNetMap, SaharaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NovaApiNetwork]
+                            get_param: [ServiceNetMap, SaharaApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NovaAdmin, port]
-      NovaInternal:
+            - get_param: [EndpointMap, SaharaAdmin, port]
+      SaharaInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaInternal, host]
+              get_param: [EndpointMap, SaharaInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NovaApiNetwork]
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, NovaApiNetwork]
+                        get_param: [ServiceNetMap, SaharaApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaInternal, host]
+              get_param: [EndpointMap, SaharaInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NovaApiNetwork]
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, NovaApiNetwork]
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
         port:
-          get_param: [EndpointMap, NovaInternal, port]
+          get_param: [EndpointMap, SaharaInternal, port]
         protocol:
-          get_param: [EndpointMap, NovaInternal, protocol]
+          get_param: [EndpointMap, SaharaInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaInternal, protocol]
+          - - get_param: [EndpointMap, SaharaInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaInternal, host]
+                  get_param: [EndpointMap, SaharaInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NovaApiNetwork]
+                    - get_param: [ServiceNetMap, SaharaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NovaApiNetwork]
+                            get_param: [ServiceNetMap, SaharaApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NovaInternal, port]
-            - /v2.1
+            - get_param: [EndpointMap, SaharaInternal, port]
+            - /v1.1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaInternal, protocol]
+          - - get_param: [EndpointMap, SaharaInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaInternal, host]
+                  get_param: [EndpointMap, SaharaInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NovaApiNetwork]
+                    - get_param: [ServiceNetMap, SaharaApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NovaApiNetwork]
+                            get_param: [ServiceNetMap, SaharaApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NovaInternal, port]
-      NovaPublic:
+            - get_param: [EndpointMap, SaharaInternal, port]
+      SaharaPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaPublic, host]
+              get_param: [EndpointMap, SaharaPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -4263,7 +5748,7 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaPublic, host]
+              get_param: [EndpointMap, SaharaPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -4274,17 +5759,17 @@ outputs:
                 - NetIpMap
                 - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, NovaPublic, port]
+          get_param: [EndpointMap, SaharaPublic, port]
         protocol:
-          get_param: [EndpointMap, NovaPublic, protocol]
+          get_param: [EndpointMap, SaharaPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaPublic, protocol]
+          - - get_param: [EndpointMap, SaharaPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaPublic, host]
+                  get_param: [EndpointMap, SaharaPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
@@ -4299,16 +5784,16 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NovaPublic, port]
-            - /v2.1
+            - get_param: [EndpointMap, SaharaPublic, port]
+            - /v1.1/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaPublic, protocol]
+          - - get_param: [EndpointMap, SaharaPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaPublic, host]
+                  get_param: [EndpointMap, SaharaPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
@@ -4323,174 +5808,175 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NovaPublic, port]
-      NovaVNCProxyAdmin:
+            - get_param: [EndpointMap, SaharaPublic, port]
+      SwiftAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaVNCProxyAdmin, host]
+              get_param: [EndpointMap, SwiftAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NovaApiNetwork]
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, NovaApiNetwork]
+                        get_param: [ServiceNetMap, SwiftProxyNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaVNCProxyAdmin, host]
+              get_param: [EndpointMap, SwiftAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NovaApiNetwork]
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, NovaApiNetwork]
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
         port:
-          get_param: [EndpointMap, NovaVNCProxyAdmin, port]
+          get_param: [EndpointMap, SwiftAdmin, port]
         protocol:
-          get_param: [EndpointMap, NovaVNCProxyAdmin, protocol]
+          get_param: [EndpointMap, SwiftAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaVNCProxyAdmin, protocol]
+          - - get_param: [EndpointMap, SwiftAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaVNCProxyAdmin, host]
+                  get_param: [EndpointMap, SwiftAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NovaApiNetwork]
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NovaApiNetwork]
+                            get_param: [ServiceNetMap, SwiftProxyNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NovaVNCProxyAdmin, port]
+            - get_param: [EndpointMap, SwiftAdmin, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaVNCProxyAdmin, protocol]
+          - - get_param: [EndpointMap, SwiftAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaVNCProxyAdmin, host]
+                  get_param: [EndpointMap, SwiftAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NovaApiNetwork]
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NovaApiNetwork]
+                            get_param: [ServiceNetMap, SwiftProxyNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NovaVNCProxyAdmin, port]
-      NovaVNCProxyInternal:
+            - get_param: [EndpointMap, SwiftAdmin, port]
+      SwiftInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaVNCProxyInternal, host]
+              get_param: [EndpointMap, SwiftInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NovaApiNetwork]
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, NovaApiNetwork]
+                        get_param: [ServiceNetMap, SwiftProxyNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaVNCProxyInternal, host]
+              get_param: [EndpointMap, SwiftInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NovaApiNetwork]
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, NovaApiNetwork]
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
         port:
-          get_param: [EndpointMap, NovaVNCProxyInternal, port]
+          get_param: [EndpointMap, SwiftInternal, port]
         protocol:
-          get_param: [EndpointMap, NovaVNCProxyInternal, protocol]
+          get_param: [EndpointMap, SwiftInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaVNCProxyInternal, protocol]
+          - - get_param: [EndpointMap, SwiftInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaVNCProxyInternal, host]
+                  get_param: [EndpointMap, SwiftInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NovaApiNetwork]
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NovaApiNetwork]
+                            get_param: [ServiceNetMap, SwiftProxyNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NovaVNCProxyInternal, port]
+            - get_param: [EndpointMap, SwiftInternal, port]
+            - /v1/AUTH_%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaVNCProxyInternal, protocol]
+          - - get_param: [EndpointMap, SwiftInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaVNCProxyInternal, host]
+                  get_param: [EndpointMap, SwiftInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NovaApiNetwork]
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NovaApiNetwork]
+                            get_param: [ServiceNetMap, SwiftProxyNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NovaVNCProxyInternal, port]
-      NovaVNCProxyPublic:
+            - get_param: [EndpointMap, SwiftInternal, port]
+      SwiftPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaVNCProxyPublic, host]
+              get_param: [EndpointMap, SwiftPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -4507,7 +5993,7 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaVNCProxyPublic, host]
+              get_param: [EndpointMap, SwiftPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -4518,17 +6004,17 @@ outputs:
                 - NetIpMap
                 - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, NovaVNCProxyPublic, port]
+          get_param: [EndpointMap, SwiftPublic, port]
         protocol:
-          get_param: [EndpointMap, NovaVNCProxyPublic, protocol]
+          get_param: [EndpointMap, SwiftPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaVNCProxyPublic, protocol]
+          - - get_param: [EndpointMap, SwiftPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaVNCProxyPublic, host]
+                  get_param: [EndpointMap, SwiftPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
@@ -4543,15 +6029,16 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NovaVNCProxyPublic, port]
+            - get_param: [EndpointMap, SwiftPublic, port]
+            - /v1/AUTH_%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaVNCProxyPublic, protocol]
+          - - get_param: [EndpointMap, SwiftPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaVNCProxyPublic, host]
+                  get_param: [EndpointMap, SwiftPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
@@ -4566,176 +6053,174 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NovaVNCProxyPublic, port]
-      SaharaAdmin:
+            - get_param: [EndpointMap, SwiftPublic, port]
+      SwiftS3Admin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, SaharaAdmin, host]
+              get_param: [EndpointMap, SwiftAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, SaharaApiNetwork]
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, SaharaApiNetwork]
+                        get_param: [ServiceNetMap, SwiftProxyNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, SaharaAdmin, host]
+              get_param: [EndpointMap, SwiftAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, SaharaApiNetwork]
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, SaharaApiNetwork]
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
         port:
-          get_param: [EndpointMap, SaharaAdmin, port]
+          get_param: [EndpointMap, SwiftAdmin, port]
         protocol:
-          get_param: [EndpointMap, SaharaAdmin, protocol]
+          get_param: [EndpointMap, SwiftAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, SaharaAdmin, protocol]
+          - - get_param: [EndpointMap, SwiftAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, SaharaAdmin, host]
+                  get_param: [EndpointMap, SwiftAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, SaharaApiNetwork]
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, SaharaApiNetwork]
+                            get_param: [ServiceNetMap, SwiftProxyNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SaharaAdmin, port]
-            - /v1.1/%(tenant_id)s
+            - get_param: [EndpointMap, SwiftAdmin, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, SaharaAdmin, protocol]
+          - - get_param: [EndpointMap, SwiftAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, SaharaAdmin, host]
+                  get_param: [EndpointMap, SwiftAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, SaharaApiNetwork]
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, SaharaApiNetwork]
+                            get_param: [ServiceNetMap, SwiftProxyNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SaharaAdmin, port]
-      SaharaInternal:
+            - get_param: [EndpointMap, SwiftAdmin, port]
+      SwiftS3Internal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, SaharaInternal, host]
+              get_param: [EndpointMap, SwiftInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, SaharaApiNetwork]
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, SaharaApiNetwork]
+                        get_param: [ServiceNetMap, SwiftProxyNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, SaharaInternal, host]
+              get_param: [EndpointMap, SwiftInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, SaharaApiNetwork]
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, SaharaApiNetwork]
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
         port:
-          get_param: [EndpointMap, SaharaInternal, port]
+          get_param: [EndpointMap, SwiftInternal, port]
         protocol:
-          get_param: [EndpointMap, SaharaInternal, protocol]
+          get_param: [EndpointMap, SwiftInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, SaharaInternal, protocol]
+          - - get_param: [EndpointMap, SwiftInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, SaharaInternal, host]
+                  get_param: [EndpointMap, SwiftInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, SaharaApiNetwork]
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, SaharaApiNetwork]
+                            get_param: [ServiceNetMap, SwiftProxyNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SaharaInternal, port]
-            - /v1.1/%(tenant_id)s
+            - get_param: [EndpointMap, SwiftInternal, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, SaharaInternal, protocol]
+          - - get_param: [EndpointMap, SwiftInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, SaharaInternal, host]
+                  get_param: [EndpointMap, SwiftInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, SaharaApiNetwork]
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, SaharaApiNetwork]
+                            get_param: [ServiceNetMap, SwiftProxyNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SaharaInternal, port]
-      SaharaPublic:
+            - get_param: [EndpointMap, SwiftInternal, port]
+      SwiftS3Public:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, SaharaPublic, host]
+              get_param: [EndpointMap, SwiftPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -4752,7 +6237,7 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, SaharaPublic, host]
+              get_param: [EndpointMap, SwiftPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -4763,17 +6248,17 @@ outputs:
                 - NetIpMap
                 - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, SaharaPublic, port]
+          get_param: [EndpointMap, SwiftPublic, port]
         protocol:
-          get_param: [EndpointMap, SaharaPublic, protocol]
+          get_param: [EndpointMap, SwiftPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, SaharaPublic, protocol]
+          - - get_param: [EndpointMap, SwiftPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, SaharaPublic, host]
+                  get_param: [EndpointMap, SwiftPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
@@ -4788,16 +6273,15 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SaharaPublic, port]
-            - /v1.1/%(tenant_id)s
+            - get_param: [EndpointMap, SwiftPublic, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, SaharaPublic, protocol]
+          - - get_param: [EndpointMap, SwiftPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, SaharaPublic, host]
+                  get_param: [EndpointMap, SwiftPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
@@ -4812,175 +6296,174 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SaharaPublic, port]
-      SwiftAdmin:
+            - get_param: [EndpointMap, SwiftPublic, port]
+      ZaqarAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, SwiftAdmin, host]
+              get_param: [EndpointMap, ZaqarAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                - get_param: [ServiceNetMap, ZaqarApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, SwiftProxyNetwork]
+                        get_param: [ServiceNetMap, ZaqarApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, SwiftAdmin, host]
+              get_param: [EndpointMap, ZaqarAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                - get_param: [ServiceNetMap, ZaqarApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                - get_param: [ServiceNetMap, ZaqarApiNetwork]
         port:
-          get_param: [EndpointMap, SwiftAdmin, port]
+          get_param: [EndpointMap, ZaqarAdmin, port]
         protocol:
-          get_param: [EndpointMap, SwiftAdmin, protocol]
+          get_param: [EndpointMap, ZaqarAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, SwiftAdmin, protocol]
+          - - get_param: [EndpointMap, ZaqarAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, SwiftAdmin, host]
+                  get_param: [EndpointMap, ZaqarAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                    - get_param: [ServiceNetMap, ZaqarApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, SwiftProxyNetwork]
+                            get_param: [ServiceNetMap, ZaqarApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SwiftAdmin, port]
+            - get_param: [EndpointMap, ZaqarAdmin, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, SwiftAdmin, protocol]
+          - - get_param: [EndpointMap, ZaqarAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, SwiftAdmin, host]
+                  get_param: [EndpointMap, ZaqarAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                    - get_param: [ServiceNetMap, ZaqarApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, SwiftProxyNetwork]
+                            get_param: [ServiceNetMap, ZaqarApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SwiftAdmin, port]
-      SwiftInternal:
+            - get_param: [EndpointMap, ZaqarAdmin, port]
+      ZaqarInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, SwiftInternal, host]
+              get_param: [EndpointMap, ZaqarInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                - get_param: [ServiceNetMap, ZaqarApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, SwiftProxyNetwork]
+                        get_param: [ServiceNetMap, ZaqarApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, SwiftInternal, host]
+              get_param: [EndpointMap, ZaqarInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                - get_param: [ServiceNetMap, ZaqarApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                - get_param: [ServiceNetMap, ZaqarApiNetwork]
         port:
-          get_param: [EndpointMap, SwiftInternal, port]
+          get_param: [EndpointMap, ZaqarInternal, port]
         protocol:
-          get_param: [EndpointMap, SwiftInternal, protocol]
+          get_param: [EndpointMap, ZaqarInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, SwiftInternal, protocol]
+          - - get_param: [EndpointMap, ZaqarInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, SwiftInternal, host]
+                  get_param: [EndpointMap, ZaqarInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                    - get_param: [ServiceNetMap, ZaqarApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, SwiftProxyNetwork]
+                            get_param: [ServiceNetMap, ZaqarApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SwiftInternal, port]
-            - /v1/AUTH_%(tenant_id)s
+            - get_param: [EndpointMap, ZaqarInternal, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, SwiftInternal, protocol]
+          - - get_param: [EndpointMap, ZaqarInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, SwiftInternal, host]
+                  get_param: [EndpointMap, ZaqarInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                    - get_param: [ServiceNetMap, ZaqarApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, SwiftProxyNetwork]
+                            get_param: [ServiceNetMap, ZaqarApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SwiftInternal, port]
-      SwiftPublic:
+            - get_param: [EndpointMap, ZaqarInternal, port]
+      ZaqarPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, SwiftPublic, host]
+              get_param: [EndpointMap, ZaqarPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -4997,7 +6480,7 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, SwiftPublic, host]
+              get_param: [EndpointMap, ZaqarPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -5008,17 +6491,17 @@ outputs:
                 - NetIpMap
                 - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, SwiftPublic, port]
+          get_param: [EndpointMap, ZaqarPublic, port]
         protocol:
-          get_param: [EndpointMap, SwiftPublic, protocol]
+          get_param: [EndpointMap, ZaqarPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, SwiftPublic, protocol]
+          - - get_param: [EndpointMap, ZaqarPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, SwiftPublic, host]
+                  get_param: [EndpointMap, ZaqarPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
@@ -5033,16 +6516,15 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SwiftPublic, port]
-            - /v1/AUTH_%(tenant_id)s
+            - get_param: [EndpointMap, ZaqarPublic, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, SwiftPublic, protocol]
+          - - get_param: [EndpointMap, ZaqarPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, SwiftPublic, host]
+                  get_param: [EndpointMap, ZaqarPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
@@ -5057,174 +6539,174 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SwiftPublic, port]
-      SwiftS3Admin:
+            - get_param: [EndpointMap, ZaqarPublic, port]
+      ZaqarWebSocketAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, SwiftAdmin, host]
+              get_param: [EndpointMap, ZaqarWebSocketAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                - get_param: [ServiceNetMap, ZaqarApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, SwiftProxyNetwork]
+                        get_param: [ServiceNetMap, ZaqarApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, SwiftAdmin, host]
+              get_param: [EndpointMap, ZaqarWebSocketAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                - get_param: [ServiceNetMap, ZaqarApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                - get_param: [ServiceNetMap, ZaqarApiNetwork]
         port:
-          get_param: [EndpointMap, SwiftAdmin, port]
+          get_param: [EndpointMap, ZaqarWebSocketAdmin, port]
         protocol:
-          get_param: [EndpointMap, SwiftAdmin, protocol]
+          get_param: [EndpointMap, ZaqarWebSocketAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, SwiftAdmin, protocol]
+          - - get_param: [EndpointMap, ZaqarWebSocketAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, SwiftAdmin, host]
+                  get_param: [EndpointMap, ZaqarWebSocketAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                    - get_param: [ServiceNetMap, ZaqarApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, SwiftProxyNetwork]
+                            get_param: [ServiceNetMap, ZaqarApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SwiftAdmin, port]
+            - get_param: [EndpointMap, ZaqarWebSocketAdmin, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, SwiftAdmin, protocol]
+          - - get_param: [EndpointMap, ZaqarWebSocketAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, SwiftAdmin, host]
+                  get_param: [EndpointMap, ZaqarWebSocketAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                    - get_param: [ServiceNetMap, ZaqarApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, SwiftProxyNetwork]
+                            get_param: [ServiceNetMap, ZaqarApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SwiftAdmin, port]
-      SwiftS3Internal:
+            - get_param: [EndpointMap, ZaqarWebSocketAdmin, port]
+      ZaqarWebSocketInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, SwiftInternal, host]
+              get_param: [EndpointMap, ZaqarWebSocketInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                - get_param: [ServiceNetMap, ZaqarApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, SwiftProxyNetwork]
+                        get_param: [ServiceNetMap, ZaqarApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, SwiftInternal, host]
+              get_param: [EndpointMap, ZaqarWebSocketInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                - get_param: [ServiceNetMap, ZaqarApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                - get_param: [ServiceNetMap, ZaqarApiNetwork]
         port:
-          get_param: [EndpointMap, SwiftInternal, port]
+          get_param: [EndpointMap, ZaqarWebSocketInternal, port]
         protocol:
-          get_param: [EndpointMap, SwiftInternal, protocol]
+          get_param: [EndpointMap, ZaqarWebSocketInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, SwiftInternal, protocol]
+          - - get_param: [EndpointMap, ZaqarWebSocketInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, SwiftInternal, host]
+                  get_param: [EndpointMap, ZaqarWebSocketInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                    - get_param: [ServiceNetMap, ZaqarApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, SwiftProxyNetwork]
+                            get_param: [ServiceNetMap, ZaqarApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SwiftInternal, port]
+            - get_param: [EndpointMap, ZaqarWebSocketInternal, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, SwiftInternal, protocol]
+          - - get_param: [EndpointMap, ZaqarWebSocketInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, SwiftInternal, host]
+                  get_param: [EndpointMap, ZaqarWebSocketInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                    - get_param: [ServiceNetMap, ZaqarApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, SwiftProxyNetwork]
+                            get_param: [ServiceNetMap, ZaqarApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SwiftInternal, port]
-      SwiftS3Public:
+            - get_param: [EndpointMap, ZaqarWebSocketInternal, port]
+      ZaqarWebSocketPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, SwiftPublic, host]
+              get_param: [EndpointMap, ZaqarWebSocketPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -5241,7 +6723,7 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, SwiftPublic, host]
+              get_param: [EndpointMap, ZaqarWebSocketPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -5252,17 +6734,17 @@ outputs:
                 - NetIpMap
                 - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, SwiftPublic, port]
+          get_param: [EndpointMap, ZaqarWebSocketPublic, port]
         protocol:
-          get_param: [EndpointMap, SwiftPublic, protocol]
+          get_param: [EndpointMap, ZaqarWebSocketPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, SwiftPublic, protocol]
+          - - get_param: [EndpointMap, ZaqarWebSocketPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, SwiftPublic, host]
+                  get_param: [EndpointMap, ZaqarWebSocketPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
@@ -5277,15 +6759,15 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SwiftPublic, port]
+            - get_param: [EndpointMap, ZaqarWebSocketPublic, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, SwiftPublic, protocol]
+          - - get_param: [EndpointMap, ZaqarWebSocketPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, SwiftPublic, host]
+                  get_param: [EndpointMap, ZaqarWebSocketPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
@@ -5300,4 +6782,4 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SwiftPublic, port]
+            - get_param: [EndpointMap, ZaqarWebSocketPublic, port]