Merge "Use parameter name to configure gmcast_listen_addr"

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

index d055311..734b643 100644 (file)
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -25,6 +25,9 @@ parameters:
        CeilometerAdmin: {protocol: http, port: '8777', host: IP_ADDRESS}
        CeilometerInternal: {protocol: http, port: '8777', host: IP_ADDRESS}
        CeilometerPublic: {protocol: http, port: '8777', host: IP_ADDRESS}
+      CephRgwAdmin: {protocol: http, port: '8080', host: IP_ADDRESS}
+      CephRgwInternal: {protocol: http, port: '8080', host: IP_ADDRESS}
+      CephRgwPublic: {protocol: http, port: '8080', host: IP_ADDRESS}
        CinderAdmin: {protocol: http, port: '8776', host: IP_ADDRESS}
        CinderInternal: {protocol: http, port: '8776', host: IP_ADDRESS}
        CinderPublic: {protocol: http, port: '8776', host: IP_ADDRESS}
@@ -69,8 +72,11 @@ parameters:
        SwiftPublic: {protocol: http, port: '8080', host: IP_ADDRESS}
      description: Mapping of service endpoint -> protocol. Typically set
        via parameter_defaults in the resource registry.
-  CloudName: {type: string, default: overcloud, description: The DNS name
-      of this cloud. e.g. ci-overcloud.tripleo.org}
+  CloudEndpoints:
+    type: json
+    default: {}
+    description: A map containing the DNS names for the different endpoints
+      (external, internal_api, etc.)
  outputs:
    endpoint_map:
      value:
@@ -80,7 +86,10 @@ outputs:
              template:
                get_param: [EndpointMap, AodhAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, AodhApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -94,7 +103,10 @@ outputs:
              template:
                get_param: [EndpointMap, AodhAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, AodhApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -112,7 +124,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, AodhAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, AodhApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -132,7 +147,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, AodhAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, AodhApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -149,7 +167,10 @@ outputs:
              template:
                get_param: [EndpointMap, AodhInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, AodhApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -163,7 +184,10 @@ outputs:
              template:
                get_param: [EndpointMap, AodhInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, AodhApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -181,7 +205,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, AodhInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, AodhApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -201,7 +228,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, AodhInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, AodhApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -218,7 +248,10 @@ outputs:
              template:
                get_param: [EndpointMap, AodhPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -232,7 +265,10 @@ outputs:
              template:
                get_param: [EndpointMap, AodhPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -250,7 +286,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, AodhPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -270,7 +309,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, AodhPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -287,7 +329,10 @@ outputs:
              template:
                get_param: [EndpointMap, CeilometerAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CeilometerApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -301,7 +346,10 @@ outputs:
              template:
                get_param: [EndpointMap, CeilometerAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CeilometerApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -319,7 +367,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CeilometerAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CeilometerApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -339,7 +390,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CeilometerAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CeilometerApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -356,7 +410,10 @@ outputs:
              template:
                get_param: [EndpointMap, CeilometerInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CeilometerApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -370,7 +427,10 @@ outputs:
              template:
                get_param: [EndpointMap, CeilometerInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CeilometerApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -388,7 +448,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CeilometerInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CeilometerApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -408,7 +471,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CeilometerInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CeilometerApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -425,7 +491,10 @@ outputs:
              template:
                get_param: [EndpointMap, CeilometerPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -439,7 +508,10 @@ outputs:
              template:
                get_param: [EndpointMap, CeilometerPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -457,7 +529,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CeilometerPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -477,7 +552,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CeilometerPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -488,13 +566,262 @@ outputs:
                          template: NETWORK_uri
              - ':'
              - get_param: [EndpointMap, CeilometerPublic, port]
+      CephRgwAdmin:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CephRgwAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CephRgwNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, CephRgwNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CephRgwAdmin, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CephRgwNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, CephRgwNetwork]
+        port:
+          get_param: [EndpointMap, CephRgwAdmin, port]
+        protocol:
+          get_param: [EndpointMap, CephRgwAdmin, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CephRgwAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CephRgwAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CephRgwNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, CephRgwNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, CephRgwAdmin, port]
+            - /swift/v1
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CephRgwAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CephRgwAdmin, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CephRgwNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, CephRgwNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, CephRgwAdmin, port]
+      CephRgwInternal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CephRgwInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CephRgwNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, CephRgwNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CephRgwInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CephRgwNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, CephRgwNetwork]
+        port:
+          get_param: [EndpointMap, CephRgwInternal, port]
+        protocol:
+          get_param: [EndpointMap, CephRgwInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CephRgwInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CephRgwInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CephRgwNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, CephRgwNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, CephRgwInternal, port]
+            - /swift/v1
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CephRgwInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CephRgwInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CephRgwNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, CephRgwNetwork]
+                        template: NETWORK_uri
+            - ':'
+            - get_param: [EndpointMap, CephRgwInternal, port]
+      CephRgwPublic:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CephRgwPublic, 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, CephRgwPublic, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, PublicNetwork]
+        port:
+          get_param: [EndpointMap, CephRgwPublic, port]
+        protocol:
+          get_param: [EndpointMap, CephRgwPublic, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CephRgwPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CephRgwPublic, 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, CephRgwPublic, port]
+            - /swift/v1
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CephRgwPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CephRgwPublic, 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, CephRgwPublic, port]
        CinderAdmin:
          host:
            str_replace:
              template:
                get_param: [EndpointMap, CinderAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -508,7 +835,10 @@ outputs:
              template:
                get_param: [EndpointMap, CinderAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -526,7 +856,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CinderAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -547,7 +880,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CinderAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -564,7 +900,10 @@ outputs:
              template:
                get_param: [EndpointMap, CinderInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -578,7 +917,10 @@ outputs:
              template:
                get_param: [EndpointMap, CinderInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -596,7 +938,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CinderInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -617,7 +962,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CinderInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -634,7 +982,10 @@ outputs:
              template:
                get_param: [EndpointMap, CinderPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -648,7 +999,10 @@ outputs:
              template:
                get_param: [EndpointMap, CinderPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -666,7 +1020,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CinderPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -687,7 +1044,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CinderPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -704,7 +1064,10 @@ outputs:
              template:
                get_param: [EndpointMap, CinderAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -718,7 +1081,10 @@ outputs:
              template:
                get_param: [EndpointMap, CinderAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -736,7 +1102,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CinderAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -757,7 +1126,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CinderAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -774,7 +1146,10 @@ outputs:
              template:
                get_param: [EndpointMap, CinderInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -788,7 +1163,10 @@ outputs:
              template:
                get_param: [EndpointMap, CinderInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -806,7 +1184,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CinderInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -827,7 +1208,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CinderInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -844,7 +1228,10 @@ outputs:
              template:
                get_param: [EndpointMap, CinderPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -858,7 +1245,10 @@ outputs:
              template:
                get_param: [EndpointMap, CinderPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -876,7 +1266,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CinderPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -897,7 +1290,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CinderPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -914,7 +1310,10 @@ outputs:
              template:
                get_param: [EndpointMap, CinderAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -928,7 +1327,10 @@ outputs:
              template:
                get_param: [EndpointMap, CinderAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -946,7 +1348,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CinderAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -967,7 +1372,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CinderAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -984,7 +1392,10 @@ outputs:
              template:
                get_param: [EndpointMap, CinderInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -998,7 +1409,10 @@ outputs:
              template:
                get_param: [EndpointMap, CinderInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, CinderApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1016,7 +1430,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CinderInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1037,7 +1454,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CinderInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, CinderApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1054,7 +1474,10 @@ outputs:
              template:
                get_param: [EndpointMap, CinderPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1068,7 +1491,10 @@ outputs:
              template:
                get_param: [EndpointMap, CinderPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1086,7 +1512,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CinderPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1107,7 +1536,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, CinderPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1124,7 +1556,10 @@ outputs:
              template:
                get_param: [EndpointMap, GlanceAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GlanceApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1138,7 +1573,10 @@ outputs:
              template:
                get_param: [EndpointMap, GlanceAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GlanceApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1156,7 +1594,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, GlanceAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GlanceApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1176,7 +1617,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, GlanceAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GlanceApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1193,7 +1637,10 @@ outputs:
              template:
                get_param: [EndpointMap, GlanceInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GlanceApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1207,7 +1654,10 @@ outputs:
              template:
                get_param: [EndpointMap, GlanceInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GlanceApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1225,7 +1675,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, GlanceInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GlanceApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1245,7 +1698,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, GlanceInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GlanceApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1262,7 +1718,10 @@ outputs:
              template:
                get_param: [EndpointMap, GlancePublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1276,7 +1735,10 @@ outputs:
              template:
                get_param: [EndpointMap, GlancePublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1294,7 +1756,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, GlancePublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1314,7 +1779,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, GlancePublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1331,7 +1799,10 @@ outputs:
              template:
                get_param: [EndpointMap, GlanceRegistryInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GlanceRegistryNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1345,7 +1816,10 @@ outputs:
              template:
                get_param: [EndpointMap, GlanceRegistryInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GlanceRegistryNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1363,7 +1837,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, GlanceRegistryInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GlanceRegistryNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1383,7 +1860,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, GlanceRegistryInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GlanceRegistryNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1400,7 +1880,10 @@ outputs:
              template:
                get_param: [EndpointMap, GnocchiAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GnocchiApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1414,7 +1897,10 @@ outputs:
              template:
                get_param: [EndpointMap, GnocchiAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GnocchiApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1432,7 +1918,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, GnocchiAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GnocchiApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1452,7 +1941,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, GnocchiAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GnocchiApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1469,7 +1961,10 @@ outputs:
              template:
                get_param: [EndpointMap, GnocchiInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GnocchiApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1483,7 +1978,10 @@ outputs:
              template:
                get_param: [EndpointMap, GnocchiInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, GnocchiApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1501,7 +1999,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, GnocchiInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GnocchiApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1521,7 +2022,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, GnocchiInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, GnocchiApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1538,7 +2042,10 @@ outputs:
              template:
                get_param: [EndpointMap, GnocchiPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1552,7 +2059,10 @@ outputs:
              template:
                get_param: [EndpointMap, GnocchiPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1570,7 +2080,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, GnocchiPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1590,7 +2103,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, GnocchiPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1607,7 +2123,10 @@ outputs:
              template:
                get_param: [EndpointMap, HeatAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, HeatApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1621,7 +2140,10 @@ outputs:
              template:
                get_param: [EndpointMap, HeatAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, HeatApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1639,7 +2161,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, HeatAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1660,7 +2185,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, HeatAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1677,7 +2205,10 @@ outputs:
              template:
                get_param: [EndpointMap, HeatInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, HeatApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1691,7 +2222,10 @@ outputs:
              template:
                get_param: [EndpointMap, HeatInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, HeatApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1709,7 +2243,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, HeatInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1730,7 +2267,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, HeatInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1747,7 +2287,10 @@ outputs:
              template:
                get_param: [EndpointMap, HeatPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1761,7 +2304,10 @@ outputs:
              template:
                get_param: [EndpointMap, HeatPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1779,7 +2325,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, HeatPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1800,7 +2349,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, HeatPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1817,7 +2369,10 @@ outputs:
              template:
                get_param: [EndpointMap, HeatCfnAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, HeatApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1831,7 +2386,10 @@ outputs:
              template:
                get_param: [EndpointMap, HeatCfnAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, HeatApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1849,7 +2407,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, HeatCfnAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1870,7 +2431,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, HeatCfnAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1887,7 +2451,10 @@ outputs:
              template:
                get_param: [EndpointMap, HeatCfnInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, HeatApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1901,7 +2468,10 @@ outputs:
              template:
                get_param: [EndpointMap, HeatCfnInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, HeatApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1919,7 +2489,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, HeatCfnInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1940,7 +2513,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, HeatCfnInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, HeatApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -1957,7 +2533,10 @@ outputs:
              template:
                get_param: [EndpointMap, HeatCfnPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1971,7 +2550,10 @@ outputs:
              template:
                get_param: [EndpointMap, HeatCfnPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -1989,7 +2571,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, HeatCfnPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2010,7 +2595,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, HeatCfnPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2027,7 +2615,10 @@ outputs:
              template:
                get_param: [EndpointMap, HorizonPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2041,7 +2632,10 @@ outputs:
              template:
                get_param: [EndpointMap, HorizonPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2059,7 +2653,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, HorizonPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2080,7 +2677,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, HorizonPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2097,7 +2697,10 @@ outputs:
              template:
                get_param: [EndpointMap, IronicAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, IronicApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2111,7 +2714,10 @@ outputs:
              template:
                get_param: [EndpointMap, IronicAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, IronicApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2129,7 +2735,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, IronicAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, IronicApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2150,7 +2759,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, IronicAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, IronicApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2167,7 +2779,10 @@ outputs:
              template:
                get_param: [EndpointMap, IronicInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, IronicApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2181,7 +2796,10 @@ outputs:
              template:
                get_param: [EndpointMap, IronicInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, IronicApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2199,7 +2817,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, IronicInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, IronicApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2220,7 +2841,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, IronicInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, IronicApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2237,7 +2861,10 @@ outputs:
              template:
                get_param: [EndpointMap, IronicPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2251,7 +2878,10 @@ outputs:
              template:
                get_param: [EndpointMap, IronicPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2269,7 +2899,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, IronicPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2290,7 +2923,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, IronicPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2307,7 +2943,10 @@ outputs:
              template:
                get_param: [EndpointMap, KeystoneAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2321,7 +2960,10 @@ outputs:
              template:
                get_param: [EndpointMap, KeystoneAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2339,7 +2981,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, KeystoneAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2360,7 +3005,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, KeystoneAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2377,7 +3025,10 @@ outputs:
              template:
                get_param: [EndpointMap, KeystoneInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2391,7 +3042,10 @@ outputs:
              template:
                get_param: [EndpointMap, KeystoneInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2409,7 +3063,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, KeystoneInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2430,7 +3087,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, KeystoneInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2447,7 +3107,10 @@ outputs:
              template:
                get_param: [EndpointMap, KeystoneInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2461,7 +3124,10 @@ outputs:
              template:
                get_param: [EndpointMap, KeystoneInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2479,7 +3145,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, KeystoneInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2500,7 +3169,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, KeystoneInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2517,7 +3189,10 @@ outputs:
              template:
                get_param: [EndpointMap, KeystonePublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2531,7 +3206,10 @@ outputs:
              template:
                get_param: [EndpointMap, KeystonePublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2549,7 +3227,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, KeystonePublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2570,7 +3251,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, KeystonePublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2587,7 +3271,10 @@ outputs:
              template:
                get_param: [EndpointMap, KeystoneAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2601,7 +3288,10 @@ outputs:
              template:
                get_param: [EndpointMap, KeystoneAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2619,7 +3309,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, KeystoneAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2640,7 +3333,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, KeystoneAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystoneAdminApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2657,7 +3353,10 @@ outputs:
              template:
                get_param: [EndpointMap, KeystoneInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2671,7 +3370,10 @@ outputs:
              template:
                get_param: [EndpointMap, KeystoneInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2689,7 +3391,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, KeystoneInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2710,7 +3415,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, KeystoneInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, KeystonePublicApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2727,7 +3435,10 @@ outputs:
              template:
                get_param: [EndpointMap, KeystonePublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2741,7 +3452,10 @@ outputs:
              template:
                get_param: [EndpointMap, KeystonePublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2759,7 +3473,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, KeystonePublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2780,7 +3497,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, KeystonePublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2797,7 +3517,10 @@ outputs:
              template:
                get_param: [EndpointMap, ManilaAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2811,7 +3534,10 @@ outputs:
              template:
                get_param: [EndpointMap, ManilaAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2829,7 +3555,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, ManilaAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2850,7 +3579,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, ManilaAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2867,7 +3599,10 @@ outputs:
              template:
                get_param: [EndpointMap, ManilaInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2881,7 +3616,10 @@ outputs:
              template:
                get_param: [EndpointMap, ManilaInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2899,7 +3637,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, ManilaInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2920,7 +3661,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, ManilaInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2937,7 +3681,10 @@ outputs:
              template:
                get_param: [EndpointMap, ManilaPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2951,7 +3698,10 @@ outputs:
              template:
                get_param: [EndpointMap, ManilaPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -2969,7 +3719,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, ManilaPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -2990,7 +3743,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, ManilaPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3007,7 +3763,10 @@ outputs:
              template:
                get_param: [EndpointMap, ManilaAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3021,7 +3780,10 @@ outputs:
              template:
                get_param: [EndpointMap, ManilaAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3039,7 +3801,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, ManilaAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3060,7 +3825,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, ManilaAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3077,7 +3845,10 @@ outputs:
              template:
                get_param: [EndpointMap, ManilaInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3091,7 +3862,10 @@ outputs:
              template:
                get_param: [EndpointMap, ManilaInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, ManilaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3109,7 +3883,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, ManilaInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3130,7 +3907,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, ManilaInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, ManilaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3147,7 +3927,10 @@ outputs:
              template:
                get_param: [EndpointMap, ManilaPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3161,7 +3944,10 @@ outputs:
              template:
                get_param: [EndpointMap, ManilaPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3179,7 +3965,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, ManilaPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3200,7 +3989,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, ManilaPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3217,7 +4009,10 @@ outputs:
              template:
                get_param: [EndpointMap, MysqlInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, MysqlNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3231,7 +4026,10 @@ outputs:
              template:
                get_param: [EndpointMap, MysqlInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, MysqlNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3249,7 +4047,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, MysqlInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, MysqlNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3269,7 +4070,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, MysqlInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, MysqlNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3286,7 +4090,10 @@ outputs:
              template:
                get_param: [EndpointMap, NeutronAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NeutronApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3300,7 +4107,10 @@ outputs:
              template:
                get_param: [EndpointMap, NeutronAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NeutronApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3318,7 +4128,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, NeutronAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NeutronApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3338,7 +4151,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, NeutronAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NeutronApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3355,7 +4171,10 @@ outputs:
              template:
                get_param: [EndpointMap, NeutronInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NeutronApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3369,7 +4188,10 @@ outputs:
              template:
                get_param: [EndpointMap, NeutronInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NeutronApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3387,7 +4209,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, NeutronInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NeutronApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3407,7 +4232,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, NeutronInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NeutronApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3424,7 +4252,10 @@ outputs:
              template:
                get_param: [EndpointMap, NeutronPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3438,7 +4269,10 @@ outputs:
              template:
                get_param: [EndpointMap, NeutronPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3456,7 +4290,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, NeutronPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3476,7 +4313,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, NeutronPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3493,7 +4333,10 @@ outputs:
              template:
                get_param: [EndpointMap, NovaAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3507,7 +4350,10 @@ outputs:
              template:
                get_param: [EndpointMap, NovaAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3525,7 +4371,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, NovaAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3546,7 +4395,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, NovaAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3563,7 +4415,10 @@ outputs:
              template:
                get_param: [EndpointMap, NovaInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3577,7 +4432,10 @@ outputs:
              template:
                get_param: [EndpointMap, NovaInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3595,7 +4453,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, NovaInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3616,7 +4477,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, NovaInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3633,7 +4497,10 @@ outputs:
              template:
                get_param: [EndpointMap, NovaPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3647,7 +4514,10 @@ outputs:
              template:
                get_param: [EndpointMap, NovaPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3665,7 +4535,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, NovaPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3686,7 +4559,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, NovaPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3703,7 +4579,10 @@ outputs:
              template:
                get_param: [EndpointMap, NovaVNCProxyAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3717,7 +4596,10 @@ outputs:
              template:
                get_param: [EndpointMap, NovaVNCProxyAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3735,7 +4617,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, NovaVNCProxyAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3755,7 +4640,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, NovaVNCProxyAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3772,7 +4660,10 @@ outputs:
              template:
                get_param: [EndpointMap, NovaVNCProxyInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3786,7 +4677,10 @@ outputs:
              template:
                get_param: [EndpointMap, NovaVNCProxyInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, NovaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3804,7 +4698,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, NovaVNCProxyInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3824,7 +4721,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, NovaVNCProxyInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, NovaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3841,7 +4741,10 @@ outputs:
              template:
                get_param: [EndpointMap, NovaVNCProxyPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3855,7 +4758,10 @@ outputs:
              template:
                get_param: [EndpointMap, NovaVNCProxyPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3873,7 +4779,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, NovaVNCProxyPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3893,7 +4802,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, NovaVNCProxyPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3910,7 +4822,10 @@ outputs:
              template:
                get_param: [EndpointMap, SaharaAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3924,7 +4839,10 @@ outputs:
              template:
                get_param: [EndpointMap, SaharaAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3942,7 +4860,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, SaharaAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SaharaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3963,7 +4884,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, SaharaAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SaharaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -3980,7 +4904,10 @@ outputs:
              template:
                get_param: [EndpointMap, SaharaInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -3994,7 +4921,10 @@ outputs:
              template:
                get_param: [EndpointMap, SaharaInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SaharaApiNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -4012,7 +4942,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, SaharaInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SaharaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -4033,7 +4966,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, SaharaInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SaharaApiNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -4050,7 +4986,10 @@ outputs:
              template:
                get_param: [EndpointMap, SaharaPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -4064,7 +5003,10 @@ outputs:
              template:
                get_param: [EndpointMap, SaharaPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -4082,7 +5024,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, SaharaPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -4103,7 +5048,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, SaharaPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -4120,7 +5068,10 @@ outputs:
              template:
                get_param: [EndpointMap, SwiftAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -4134,7 +5085,10 @@ outputs:
              template:
                get_param: [EndpointMap, SwiftAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -4152,7 +5106,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, SwiftAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -4172,7 +5129,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, SwiftAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -4189,7 +5149,10 @@ outputs:
              template:
                get_param: [EndpointMap, SwiftInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -4203,7 +5166,10 @@ outputs:
              template:
                get_param: [EndpointMap, SwiftInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -4221,7 +5187,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, SwiftInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -4242,7 +5211,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, SwiftInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -4259,7 +5231,10 @@ outputs:
              template:
                get_param: [EndpointMap, SwiftPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -4273,7 +5248,10 @@ outputs:
              template:
                get_param: [EndpointMap, SwiftPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -4291,7 +5269,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, SwiftPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -4312,7 +5293,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, SwiftPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -4329,7 +5313,10 @@ outputs:
              template:
                get_param: [EndpointMap, SwiftAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -4343,7 +5330,10 @@ outputs:
              template:
                get_param: [EndpointMap, SwiftAdmin, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -4361,7 +5351,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, SwiftAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -4381,7 +5374,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, SwiftAdmin, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -4398,7 +5394,10 @@ outputs:
              template:
                get_param: [EndpointMap, SwiftInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -4412,7 +5411,10 @@ outputs:
              template:
                get_param: [EndpointMap, SwiftInternal, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, SwiftProxyNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -4430,7 +5432,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, SwiftInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -4450,7 +5455,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, SwiftInternal, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, SwiftProxyNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -4467,7 +5475,10 @@ outputs:
              template:
                get_param: [EndpointMap, SwiftPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -4481,7 +5492,10 @@ outputs:
              template:
                get_param: [EndpointMap, SwiftPublic, host]
              params:
-              CLOUDNAME: {get_param: CloudName}
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, PublicNetwork]
                IP_ADDRESS:
                  get_param:
                  - NetIpMap
@@ -4499,7 +5513,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, SwiftPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap
@@ -4519,7 +5536,10 @@ outputs:
                  template:
                    get_param: [EndpointMap, SwiftPublic, host]
                  params:
-                  CLOUDNAME: {get_param: CloudName}
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, PublicNetwork]
                    IP_ADDRESS:
                      get_param:
                      - NetIpMap