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 734b643..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,6 +22,9 @@ 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}
@@ -54,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}
@@ -64,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:
@@ -323,6 +338,249 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, AodhPublic, port]
+      BarbicanAdmin:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, BarbicanAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, BarbicanApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, BarbicanApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, BarbicanAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, BarbicanApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, BarbicanApiNetwork]
+        port:
+          get_param: [EndpointMap, BarbicanAdmin, port]
+        protocol:
+          get_param: [EndpointMap, BarbicanAdmin, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, BarbicanAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, BarbicanAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, BarbicanApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, BarbicanApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, BarbicanAdmin, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, BarbicanAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, BarbicanAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, BarbicanApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, BarbicanApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, BarbicanAdmin, port]
+      BarbicanInternal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, BarbicanInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, BarbicanApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, BarbicanApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, BarbicanInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, BarbicanApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, BarbicanApiNetwork]
+        port:
+          get_param: [EndpointMap, BarbicanInternal, port]
+        protocol:
+          get_param: [EndpointMap, BarbicanInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, BarbicanInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, BarbicanInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, BarbicanApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, BarbicanApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, BarbicanInternal, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, BarbicanInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, BarbicanInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, BarbicanApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, BarbicanApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, BarbicanInternal, port]
+      BarbicanPublic:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, BarbicanPublic, 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, BarbicanPublic, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, PublicNetwork]
+        port:
+          get_param: [EndpointMap, BarbicanPublic, port]
+        protocol:
+          get_param: [EndpointMap, BarbicanPublic, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, BarbicanPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, BarbicanPublic, 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, BarbicanPublic, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, BarbicanPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, BarbicanPublic, 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, BarbicanPublic, port]
       CeilometerAdmin:
         host:
           str_replace:
@@ -4003,239 +4261,485 @@ outputs:
                         template: NETWORK_uri
             - ':'
             - get_param: [EndpointMap, ManilaPublic, port]
-      MysqlInternal:
+      MistralAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, MysqlInternal, host]
+              get_param: [EndpointMap, MistralAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, MysqlNetwork]
+                - get_param: [ServiceNetMap, MistralApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, MysqlNetwork]
+                        get_param: [ServiceNetMap, MistralApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, MysqlInternal, host]
+              get_param: [EndpointMap, MistralAdmin, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, MysqlNetwork]
+                - get_param: [ServiceNetMap, MistralApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, MysqlNetwork]
+                - get_param: [ServiceNetMap, MistralApiNetwork]
         port:
-          get_param: [EndpointMap, MysqlInternal, port]
+          get_param: [EndpointMap, MistralAdmin, port]
         protocol:
-          get_param: [EndpointMap, MysqlInternal, protocol]
+          get_param: [EndpointMap, MistralAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, MysqlInternal, protocol]
+          - - get_param: [EndpointMap, MistralAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, MysqlInternal, host]
+                  get_param: [EndpointMap, MistralAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, MysqlNetwork]
+                    - get_param: [ServiceNetMap, MistralApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, MysqlNetwork]
+                            get_param: [ServiceNetMap, MistralApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, MysqlInternal, port]
+            - get_param: [EndpointMap, MistralAdmin, port]
+            - /v2
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, MysqlInternal, protocol]
+          - - get_param: [EndpointMap, MistralAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, MysqlInternal, host]
+                  get_param: [EndpointMap, MistralAdmin, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, MysqlNetwork]
+                    - get_param: [ServiceNetMap, MistralApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, MysqlNetwork]
+                            get_param: [ServiceNetMap, MistralApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, MysqlInternal, port]
-      NeutronAdmin:
+            - get_param: [EndpointMap, MistralAdmin, port]
+      MistralInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NeutronAdmin, host]
+              get_param: [EndpointMap, MistralInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NeutronApiNetwork]
+                - get_param: [ServiceNetMap, MistralApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, NeutronApiNetwork]
+                        get_param: [ServiceNetMap, MistralApiNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, NeutronAdmin, host]
+              get_param: [EndpointMap, MistralInternal, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NeutronApiNetwork]
+                - get_param: [ServiceNetMap, MistralApiNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, NeutronApiNetwork]
+                - get_param: [ServiceNetMap, MistralApiNetwork]
         port:
-          get_param: [EndpointMap, NeutronAdmin, port]
+          get_param: [EndpointMap, MistralInternal, port]
         protocol:
-          get_param: [EndpointMap, NeutronAdmin, protocol]
+          get_param: [EndpointMap, MistralInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NeutronAdmin, protocol]
+          - - get_param: [EndpointMap, MistralInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NeutronAdmin, host]
+                  get_param: [EndpointMap, MistralInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NeutronApiNetwork]
+                    - get_param: [ServiceNetMap, MistralApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NeutronApiNetwork]
+                            get_param: [ServiceNetMap, MistralApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NeutronAdmin, port]
+            - get_param: [EndpointMap, MistralInternal, port]
+            - /v2
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NeutronAdmin, protocol]
+          - - get_param: [EndpointMap, MistralInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NeutronAdmin, host]
+                  get_param: [EndpointMap, MistralInternal, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NeutronApiNetwork]
+                    - get_param: [ServiceNetMap, MistralApiNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NeutronApiNetwork]
+                            get_param: [ServiceNetMap, MistralApiNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NeutronAdmin, port]
-      NeutronInternal:
+            - get_param: [EndpointMap, MistralInternal, port]
+      MistralPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NeutronInternal, host]
+              get_param: [EndpointMap, MistralPublic, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NeutronApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
                 - str_replace:
                     params:
                       NETWORK:
-                        get_param: [ServiceNetMap, NeutronApiNetwork]
+                        get_param: [ServiceNetMap, PublicNetwork]
                     template: NETWORK_uri
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, NeutronInternal, host]
+              get_param: [EndpointMap, MistralPublic, host]
             params:
               CLOUDNAME:
                 get_param:
                 - CloudEndpoints
-                - get_param: [ServiceNetMap, NeutronApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
               IP_ADDRESS:
                 get_param:
                 - NetIpMap
-                - get_param: [ServiceNetMap, NeutronApiNetwork]
+                - get_param: [ServiceNetMap, PublicNetwork]
         port:
-          get_param: [EndpointMap, NeutronInternal, port]
+          get_param: [EndpointMap, MistralPublic, port]
         protocol:
-          get_param: [EndpointMap, NeutronInternal, protocol]
+          get_param: [EndpointMap, MistralPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NeutronInternal, protocol]
+          - - get_param: [EndpointMap, MistralPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NeutronInternal, host]
+                  get_param: [EndpointMap, MistralPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NeutronApiNetwork]
+                    - get_param: [ServiceNetMap, PublicNetwork]
                   IP_ADDRESS:
                     get_param:
                     - NetIpMap
                     - str_replace:
                         params:
                           NETWORK:
-                            get_param: [ServiceNetMap, NeutronApiNetwork]
+                            get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, NeutronInternal, port]
+            - get_param: [EndpointMap, MistralPublic, port]
+            - /v2
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NeutronInternal, protocol]
+          - - get_param: [EndpointMap, MistralPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NeutronInternal, host]
+                  get_param: [EndpointMap, MistralPublic, host]
                 params:
                   CLOUDNAME:
                     get_param:
                     - CloudEndpoints
-                    - get_param: [ServiceNetMap, NeutronApiNetwork]
+                    - 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
@@ -4675,71 +5179,804 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaVNCProxyInternal, host]
+              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, NovaApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, NovaApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, NovaVNCProxyInternal, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, NovaVNCProxyInternal, protocol]
+            - ://
+            - 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
+            - ':'
+            - get_param: [EndpointMap, NovaVNCProxyInternal, port]
+      NovaVNCProxyPublic:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, NovaVNCProxyPublic, 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, NovaVNCProxyPublic, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, PublicNetwork]
+        port:
+          get_param: [EndpointMap, NovaVNCProxyPublic, port]
+        protocol:
+          get_param: [EndpointMap, NovaVNCProxyPublic, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, NovaVNCProxyPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, NovaVNCProxyPublic, 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, NovaVNCProxyPublic, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, NovaVNCProxyPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, NovaVNCProxyPublic, 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, NovaVNCProxyPublic, port]
+      PankoAdmin:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, PankoAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PankoApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, PankoApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, PankoAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PankoApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, PankoApiNetwork]
+        port:
+          get_param: [EndpointMap, PankoAdmin, port]
+        protocol:
+          get_param: [EndpointMap, PankoAdmin, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, PankoAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, PankoAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PankoApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, PankoApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, PankoAdmin, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, PankoAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, PankoAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PankoApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, PankoApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, PankoAdmin, port]
+      PankoInternal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, PankoInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PankoApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, PankoApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, PankoInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PankoApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, PankoApiNetwork]
+        port:
+          get_param: [EndpointMap, PankoInternal, port]
+        protocol:
+          get_param: [EndpointMap, PankoInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, PankoInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, PankoInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PankoApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, PankoApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, PankoInternal, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, PankoInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, PankoInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PankoApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, PankoApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, PankoInternal, port]
+      PankoPublic:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, PankoPublic, 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, PankoPublic, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, PublicNetwork]
+        port:
+          get_param: [EndpointMap, PankoPublic, port]
+        protocol:
+          get_param: [EndpointMap, PankoPublic, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, PankoPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, PankoPublic, 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, PankoPublic, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, PankoPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, PankoPublic, 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, PankoPublic, port]
+      SaharaAdmin:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, SaharaAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, SaharaApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, SaharaAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
+        port:
+          get_param: [EndpointMap, SaharaAdmin, port]
+        protocol:
+          get_param: [EndpointMap, SaharaAdmin, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, SaharaAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, SaharaAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SaharaApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, SaharaApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, SaharaAdmin, port]
+            - /v1.1/%(tenant_id)s
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, SaharaAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, SaharaAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SaharaApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, SaharaApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, SaharaAdmin, port]
+      SaharaInternal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, SaharaInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, SaharaApiNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, SaharaInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
+        port:
+          get_param: [EndpointMap, SaharaInternal, port]
+        protocol:
+          get_param: [EndpointMap, SaharaInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, SaharaInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, SaharaInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SaharaApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, SaharaApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, SaharaInternal, port]
+            - /v1.1/%(tenant_id)s
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, SaharaInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, SaharaInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SaharaApiNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, SaharaApiNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, SaharaInternal, port]
+      SaharaPublic:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, SaharaPublic, 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, SaharaPublic, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, PublicNetwork]
+        port:
+          get_param: [EndpointMap, SaharaPublic, port]
+        protocol:
+          get_param: [EndpointMap, SaharaPublic, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, SaharaPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, SaharaPublic, 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, SaharaPublic, port]
+            - /v1.1/%(tenant_id)s
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, SaharaPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, SaharaPublic, 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, SaharaPublic, port]
+      SwiftAdmin:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, SwiftAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, SwiftProxyNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, SwiftAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
+        port:
+          get_param: [EndpointMap, SwiftAdmin, port]
+        protocol:
+          get_param: [EndpointMap, SwiftAdmin, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, SwiftAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, SwiftAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, SwiftProxyNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, SwiftAdmin, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, SwiftAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, SwiftAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, SwiftProxyNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, SwiftAdmin, port]
+      SwiftInternal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, SwiftInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, SwiftProxyNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              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:
@@ -4756,7 +5993,7 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaVNCProxyPublic, host]
+              get_param: [EndpointMap, SwiftPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -4767,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:
@@ -4792,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:
@@ -4815,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:
@@ -5001,7 +6237,7 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, SaharaPublic, host]
+              get_param: [EndpointMap, SwiftPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -5012,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:
@@ -5037,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:
@@ -5061,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:
@@ -5246,7 +6480,7 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, SwiftPublic, host]
+              get_param: [EndpointMap, ZaqarPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -5257,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:
@@ -5282,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:
@@ -5306,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:
@@ -5490,7 +6723,7 @@ outputs:
         host_nobrackets:
           str_replace:
             template:
-              get_param: [EndpointMap, SwiftPublic, host]
+              get_param: [EndpointMap, ZaqarWebSocketPublic, host]
             params:
               CLOUDNAME:
                 get_param:
@@ -5501,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:
@@ -5526,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:
@@ -5549,4 +6782,4 @@ outputs:
                             get_param: [ServiceNetMap, PublicNetwork]
                         template: NETWORK_uri
             - ':'
-            - get_param: [EndpointMap, SwiftPublic, port]
+            - get_param: [EndpointMap, ZaqarWebSocketPublic, port]