Add support for cinder v3 endpoint

[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 956fb0b..8d152af 100644 (file)
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -12,9 +12,14 @@ parameters:
   CeilometerApiVirtualIP: {type: string, default: ''}
   CinderApiVirtualIP: {type: string, default: ''}
   GlanceApiVirtualIP: {type: string, default: ''}
+  GlanceRegistryVirtualIP: {type: string, default: ''}
+  GnocchiApiVirtualIP: {type: string, default: ''}
   HeatApiVirtualIP: {type: string, default: ''}
+  IronicApiVirtualIP: {type: string, default: ''}
   KeystoneAdminApiVirtualIP: {type: string, default: ''}
   KeystonePublicApiVirtualIP: {type: string, default: ''}
+  ManilaApiVirtualIP: {type: string, default: ''}
+  MysqlNoBracketsVirtualIP: {type: string, default: ''}
   MysqlVirtualIP: {type: string, default: ''}
   NeutronApiVirtualIP: {type: string, default: ''}
   NovaApiVirtualIP: {type: string, default: ''}
@@ -36,25 +41,35 @@ parameters:
       GlanceAdmin: {protocol: http, port: '9292', host: IP_ADDRESS}
       GlanceInternal: {protocol: http, port: '9292', host: IP_ADDRESS}
       GlancePublic: {protocol: http, port: '9292', host: IP_ADDRESS}
+      GlanceRegistryInternal: {protocol: http, port: '9191', host: IP_ADDRESS}
+      GnocchiAdmin: {protocol: http, port: '8041', host: IP_ADDRESS}
+      GnocchiInternal: {protocol: http, port: '8041', host: IP_ADDRESS}
+      GnocchiPublic: {protocol: http, port: '8041', host: IP_ADDRESS}
       HeatAdmin: {protocol: http, port: '8004', host: IP_ADDRESS}
       HeatInternal: {protocol: http, port: '8004', host: IP_ADDRESS}
       HeatPublic: {protocol: http, port: '8004', host: IP_ADDRESS}
+      HeatCfnAdmin: {protocol: http, port: '8000', host: IP_ADDRESS}
+      HeatCfnInternal: {protocol: http, port: '8000', host: IP_ADDRESS}
+      HeatCfnPublic: {protocol: http, port: '8000', host: IP_ADDRESS}
       HorizonPublic: {protocol: http, port: '80', host: IP_ADDRESS}
+      IronicAdmin: {protocol: http, port: '6385', host: IP_ADDRESS}
+      IronicInternal: {protocol: http, port: '6385', host: IP_ADDRESS}
+      IronicPublic: {protocol: http, port: '6385', host: IP_ADDRESS}
       KeystoneAdmin: {protocol: http, port: '35357', host: IP_ADDRESS}
       KeystoneInternal: {protocol: http, port: '5000', host: IP_ADDRESS}
       KeystonePublic: {protocol: http, port: '5000', host: IP_ADDRESS}
-      KeystoneV3Admin: {protocol: http, port: '35357', host: IP_ADDRESS}
-      KeystoneV3Internal: {protocol: http, port: '5000', host: IP_ADDRESS}
-      KeystoneV3Public: {protocol: http, port: '5000', host: IP_ADDRESS}
+      ManilaAdmin: {protocol: http, port: '8786', host: IP_ADDRESS}
+      ManilaInternal: {protocol: http, port: '8786', host: IP_ADDRESS}
+      ManilaPublic: {protocol: http, port: '8786', host: IP_ADDRESS}
+      MysqlInternal: {protocol: mysql+pymysql, port: '3306', host: IP_ADDRESS}
+      MysqlNoBracketsInternal: {protocol: mysql+pymysql, port: '3306',
+        host: IP_ADDRESS}
       NeutronAdmin: {protocol: http, port: '9696', host: IP_ADDRESS}
       NeutronInternal: {protocol: http, port: '9696', host: IP_ADDRESS}
       NeutronPublic: {protocol: http, port: '9696', host: IP_ADDRESS}
       NovaAdmin: {protocol: http, port: '8774', host: IP_ADDRESS}
       NovaInternal: {protocol: http, port: '8774', host: IP_ADDRESS}
       NovaPublic: {protocol: http, port: '8774', host: IP_ADDRESS}
-      NovaEC2Admin: {protocol: http, port: '8773', host: IP_ADDRESS}
-      NovaEC2Internal: {protocol: http, port: '8773', host: IP_ADDRESS}
-      NovaEC2Public: {protocol: http, port: '8773', host: IP_ADDRESS}
       NovaVNCProxyAdmin: {protocol: http, port: '6080', host: IP_ADDRESS}
       NovaVNCProxyInternal: {protocol: http, port: '6080', host: IP_ADDRESS}
       NovaVNCProxyPublic: {protocol: http, port: '6080', host: IP_ADDRESS}
@@ -533,6 +548,123 @@ outputs:
                   IP_ADDRESS: {get_param: PublicVirtualIP}
             - ':'
             - get_param: [EndpointMap, CinderPublic, port]
+      CinderV3Admin:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CinderAdmin, host]
+            params:
+              CLOUDNAME: {get_param: CloudName}
+              IP_ADDRESS: {get_param: CinderApiVirtualIP}
+        port:
+          get_param: [EndpointMap, CinderAdmin, port]
+        protocol:
+          get_param: [EndpointMap, CinderAdmin, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CinderAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CinderAdmin, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: CinderApiVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, CinderAdmin, port]
+            - /v3/%(tenant_id)s
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CinderAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CinderAdmin, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: CinderApiVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, CinderAdmin, port]
+      CinderV3Internal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CinderInternal, host]
+            params:
+              CLOUDNAME: {get_param: CloudName}
+              IP_ADDRESS: {get_param: CinderApiVirtualIP}
+        port:
+          get_param: [EndpointMap, CinderInternal, port]
+        protocol:
+          get_param: [EndpointMap, CinderInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CinderInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CinderInternal, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: CinderApiVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, CinderInternal, port]
+            - /v3/%(tenant_id)s
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CinderInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CinderInternal, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: CinderApiVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, CinderInternal, port]
+      CinderV3Public:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, CinderPublic, host]
+            params:
+              CLOUDNAME: {get_param: CloudName}
+              IP_ADDRESS: {get_param: PublicVirtualIP}
+        port:
+          get_param: [EndpointMap, CinderPublic, port]
+        protocol:
+          get_param: [EndpointMap, CinderPublic, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CinderPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CinderPublic, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: PublicVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, CinderPublic, port]
+            - /v3/%(tenant_id)s
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, CinderPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, CinderPublic, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: PublicVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, CinderPublic, port]
       GlanceAdmin:
         host:
           str_replace:
@@ -647,6 +779,158 @@ outputs:
                   IP_ADDRESS: {get_param: PublicVirtualIP}
             - ':'
             - get_param: [EndpointMap, GlancePublic, port]
+      GlanceRegistryInternal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, GlanceRegistryInternal, host]
+            params:
+              CLOUDNAME: {get_param: CloudName}
+              IP_ADDRESS: {get_param: GlanceRegistryVirtualIP}
+        port:
+          get_param: [EndpointMap, GlanceRegistryInternal, port]
+        protocol:
+          get_param: [EndpointMap, GlanceRegistryInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, GlanceRegistryInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, GlanceRegistryInternal, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: GlanceRegistryVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, GlanceRegistryInternal, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, GlanceRegistryInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, GlanceRegistryInternal, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: GlanceRegistryVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, GlanceRegistryInternal, port]
+      GnocchiAdmin:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, GnocchiAdmin, host]
+            params:
+              CLOUDNAME: {get_param: CloudName}
+              IP_ADDRESS: {get_param: GnocchiApiVirtualIP}
+        port:
+          get_param: [EndpointMap, GnocchiAdmin, port]
+        protocol:
+          get_param: [EndpointMap, GnocchiAdmin, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, GnocchiAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, GnocchiAdmin, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: GnocchiApiVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, GnocchiAdmin, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, GnocchiAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, GnocchiAdmin, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: GnocchiApiVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, GnocchiAdmin, port]
+      GnocchiInternal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, GnocchiInternal, host]
+            params:
+              CLOUDNAME: {get_param: CloudName}
+              IP_ADDRESS: {get_param: GnocchiApiVirtualIP}
+        port:
+          get_param: [EndpointMap, GnocchiInternal, port]
+        protocol:
+          get_param: [EndpointMap, GnocchiInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, GnocchiInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, GnocchiInternal, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: GnocchiApiVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, GnocchiInternal, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, GnocchiInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, GnocchiInternal, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: GnocchiApiVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, GnocchiInternal, port]
+      GnocchiPublic:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, GnocchiPublic, host]
+            params:
+              CLOUDNAME: {get_param: CloudName}
+              IP_ADDRESS: {get_param: PublicVirtualIP}
+        port:
+          get_param: [EndpointMap, GnocchiPublic, port]
+        protocol:
+          get_param: [EndpointMap, GnocchiPublic, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, GnocchiPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, GnocchiPublic, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: PublicVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, GnocchiPublic, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, GnocchiPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, GnocchiPublic, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: PublicVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, GnocchiPublic, port]
       HeatAdmin:
         host:
           str_replace:
@@ -747,62 +1031,296 @@ outputs:
                   get_param: [EndpointMap, HeatPublic, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: PublicVirtualIP}
+                  IP_ADDRESS: {get_param: PublicVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, HeatPublic, port]
+            - /v1/%(tenant_id)s
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, HeatPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, HeatPublic, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: PublicVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, HeatPublic, port]
+      HeatCfnAdmin:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, HeatCfnAdmin, host]
+            params:
+              CLOUDNAME: {get_param: CloudName}
+              IP_ADDRESS: {get_param: HeatApiVirtualIP}
+        port:
+          get_param: [EndpointMap, HeatCfnAdmin, port]
+        protocol:
+          get_param: [EndpointMap, HeatCfnAdmin, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, HeatCfnAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, HeatCfnAdmin, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: HeatApiVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, HeatCfnAdmin, port]
+            - /v1
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, HeatCfnAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, HeatCfnAdmin, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: HeatApiVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, HeatCfnAdmin, port]
+      HeatCfnInternal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, HeatCfnInternal, host]
+            params:
+              CLOUDNAME: {get_param: CloudName}
+              IP_ADDRESS: {get_param: HeatApiVirtualIP}
+        port:
+          get_param: [EndpointMap, HeatCfnInternal, port]
+        protocol:
+          get_param: [EndpointMap, HeatCfnInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, HeatCfnInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, HeatCfnInternal, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: HeatApiVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, HeatCfnInternal, port]
+            - /v1
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, HeatCfnInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, HeatCfnInternal, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: HeatApiVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, HeatCfnInternal, port]
+      HeatCfnPublic:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, HeatCfnPublic, host]
+            params:
+              CLOUDNAME: {get_param: CloudName}
+              IP_ADDRESS: {get_param: PublicVirtualIP}
+        port:
+          get_param: [EndpointMap, HeatCfnPublic, port]
+        protocol:
+          get_param: [EndpointMap, HeatCfnPublic, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, HeatCfnPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, HeatCfnPublic, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: PublicVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, HeatCfnPublic, port]
+            - /v1
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, HeatCfnPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, HeatCfnPublic, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: PublicVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, HeatCfnPublic, port]
+      HorizonPublic:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, HorizonPublic, host]
+            params:
+              CLOUDNAME: {get_param: CloudName}
+              IP_ADDRESS: {get_param: PublicVirtualIP}
+        port:
+          get_param: [EndpointMap, HorizonPublic, port]
+        protocol:
+          get_param: [EndpointMap, HorizonPublic, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, HorizonPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, HorizonPublic, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: PublicVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, HorizonPublic, port]
+            - /dashboard
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, HorizonPublic, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, HorizonPublic, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: PublicVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, HorizonPublic, port]
+      IronicAdmin:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, IronicAdmin, host]
+            params:
+              CLOUDNAME: {get_param: CloudName}
+              IP_ADDRESS: {get_param: IronicApiVirtualIP}
+        port:
+          get_param: [EndpointMap, IronicAdmin, port]
+        protocol:
+          get_param: [EndpointMap, IronicAdmin, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, IronicAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, IronicAdmin, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: IronicApiVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, IronicAdmin, port]
+            - /v1
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, IronicAdmin, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, IronicAdmin, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: IronicApiVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, IronicAdmin, port]
+      IronicInternal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, IronicInternal, host]
+            params:
+              CLOUDNAME: {get_param: CloudName}
+              IP_ADDRESS: {get_param: IronicApiVirtualIP}
+        port:
+          get_param: [EndpointMap, IronicInternal, port]
+        protocol:
+          get_param: [EndpointMap, IronicInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, IronicInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, IronicInternal, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: IronicApiVirtualIP}
             - ':'
-            - get_param: [EndpointMap, HeatPublic, port]
-            - /v1/%(tenant_id)s
+            - get_param: [EndpointMap, IronicInternal, port]
+            - /v1
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, HeatPublic, protocol]
+          - - get_param: [EndpointMap, IronicInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, HeatPublic, host]
+                  get_param: [EndpointMap, IronicInternal, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: PublicVirtualIP}
+                  IP_ADDRESS: {get_param: IronicApiVirtualIP}
             - ':'
-            - get_param: [EndpointMap, HeatPublic, port]
-      HorizonPublic:
+            - get_param: [EndpointMap, IronicInternal, port]
+      IronicPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, HorizonPublic, host]
+              get_param: [EndpointMap, IronicPublic, host]
             params:
               CLOUDNAME: {get_param: CloudName}
               IP_ADDRESS: {get_param: PublicVirtualIP}
         port:
-          get_param: [EndpointMap, HorizonPublic, port]
+          get_param: [EndpointMap, IronicPublic, port]
         protocol:
-          get_param: [EndpointMap, HorizonPublic, protocol]
+          get_param: [EndpointMap, IronicPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, HorizonPublic, protocol]
+          - - get_param: [EndpointMap, IronicPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, HorizonPublic, host]
+                  get_param: [EndpointMap, IronicPublic, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
                   IP_ADDRESS: {get_param: PublicVirtualIP}
             - ':'
-            - get_param: [EndpointMap, HorizonPublic, port]
-            - /dashboard
+            - get_param: [EndpointMap, IronicPublic, port]
+            - /v1
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, HorizonPublic, protocol]
+          - - get_param: [EndpointMap, IronicPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, HorizonPublic, host]
+                  get_param: [EndpointMap, IronicPublic, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
                   IP_ADDRESS: {get_param: PublicVirtualIP}
             - ':'
-            - get_param: [EndpointMap, HorizonPublic, port]
+            - get_param: [EndpointMap, IronicPublic, port]
       KeystoneAdmin:
         host:
           str_replace:
@@ -963,584 +1481,543 @@ outputs:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneV3Admin, host]
+              get_param: [EndpointMap, KeystoneAdmin, host]
             params:
               CLOUDNAME: {get_param: CloudName}
               IP_ADDRESS: {get_param: KeystoneAdminApiVirtualIP}
         port:
-          get_param: [EndpointMap, KeystoneV3Admin, port]
+          get_param: [EndpointMap, KeystoneAdmin, port]
         protocol:
-          get_param: [EndpointMap, KeystoneV3Admin, protocol]
+          get_param: [EndpointMap, KeystoneAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneV3Admin, protocol]
+          - - get_param: [EndpointMap, KeystoneAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneV3Admin, host]
+                  get_param: [EndpointMap, KeystoneAdmin, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
                   IP_ADDRESS: {get_param: KeystoneAdminApiVirtualIP}
             - ':'
-            - get_param: [EndpointMap, KeystoneV3Admin, port]
+            - get_param: [EndpointMap, KeystoneAdmin, port]
             - /v3
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneV3Admin, protocol]
+          - - get_param: [EndpointMap, KeystoneAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneV3Admin, host]
+                  get_param: [EndpointMap, KeystoneAdmin, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
                   IP_ADDRESS: {get_param: KeystoneAdminApiVirtualIP}
             - ':'
-            - get_param: [EndpointMap, KeystoneV3Admin, port]
+            - get_param: [EndpointMap, KeystoneAdmin, port]
       KeystoneV3Internal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneV3Internal, host]
+              get_param: [EndpointMap, KeystoneInternal, host]
             params:
               CLOUDNAME: {get_param: CloudName}
               IP_ADDRESS: {get_param: KeystonePublicApiVirtualIP}
         port:
-          get_param: [EndpointMap, KeystoneV3Internal, port]
+          get_param: [EndpointMap, KeystoneInternal, port]
         protocol:
-          get_param: [EndpointMap, KeystoneV3Internal, protocol]
+          get_param: [EndpointMap, KeystoneInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneV3Internal, protocol]
+          - - get_param: [EndpointMap, KeystoneInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneV3Internal, host]
+                  get_param: [EndpointMap, KeystoneInternal, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
                   IP_ADDRESS: {get_param: KeystonePublicApiVirtualIP}
             - ':'
-            - get_param: [EndpointMap, KeystoneV3Internal, port]
+            - get_param: [EndpointMap, KeystoneInternal, port]
             - /v3
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneV3Internal, protocol]
+          - - get_param: [EndpointMap, KeystoneInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneV3Internal, host]
+                  get_param: [EndpointMap, KeystoneInternal, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
                   IP_ADDRESS: {get_param: KeystonePublicApiVirtualIP}
             - ':'
-            - get_param: [EndpointMap, KeystoneV3Internal, port]
+            - get_param: [EndpointMap, KeystoneInternal, port]
       KeystoneV3Public:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, KeystoneV3Public, host]
+              get_param: [EndpointMap, KeystonePublic, host]
             params:
               CLOUDNAME: {get_param: CloudName}
               IP_ADDRESS: {get_param: PublicVirtualIP}
         port:
-          get_param: [EndpointMap, KeystoneV3Public, port]
+          get_param: [EndpointMap, KeystonePublic, port]
         protocol:
-          get_param: [EndpointMap, KeystoneV3Public, protocol]
+          get_param: [EndpointMap, KeystonePublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneV3Public, protocol]
+          - - get_param: [EndpointMap, KeystonePublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneV3Public, host]
+                  get_param: [EndpointMap, KeystonePublic, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
                   IP_ADDRESS: {get_param: PublicVirtualIP}
             - ':'
-            - get_param: [EndpointMap, KeystoneV3Public, port]
+            - get_param: [EndpointMap, KeystonePublic, port]
             - /v3
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, KeystoneV3Public, protocol]
+          - - get_param: [EndpointMap, KeystonePublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, KeystoneV3Public, host]
+                  get_param: [EndpointMap, KeystonePublic, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
                   IP_ADDRESS: {get_param: PublicVirtualIP}
             - ':'
-            - get_param: [EndpointMap, KeystoneV3Public, port]
-      NeutronAdmin:
+            - get_param: [EndpointMap, KeystonePublic, port]
+      ManilaAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NeutronAdmin, host]
+              get_param: [EndpointMap, ManilaAdmin, host]
             params:
               CLOUDNAME: {get_param: CloudName}
-              IP_ADDRESS: {get_param: NeutronApiVirtualIP}
+              IP_ADDRESS: {get_param: ManilaApiVirtualIP}
         port:
-          get_param: [EndpointMap, NeutronAdmin, port]
+          get_param: [EndpointMap, ManilaAdmin, port]
         protocol:
-          get_param: [EndpointMap, NeutronAdmin, protocol]
+          get_param: [EndpointMap, ManilaAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NeutronAdmin, protocol]
+          - - get_param: [EndpointMap, ManilaAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NeutronAdmin, host]
+                  get_param: [EndpointMap, ManilaAdmin, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: NeutronApiVirtualIP}
+                  IP_ADDRESS: {get_param: ManilaApiVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NeutronAdmin, port]
+            - get_param: [EndpointMap, ManilaAdmin, port]
+            - /v2/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NeutronAdmin, protocol]
+          - - get_param: [EndpointMap, ManilaAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NeutronAdmin, host]
+                  get_param: [EndpointMap, ManilaAdmin, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: NeutronApiVirtualIP}
+                  IP_ADDRESS: {get_param: ManilaApiVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NeutronAdmin, port]
-      NeutronInternal:
+            - get_param: [EndpointMap, ManilaAdmin, port]
+      ManilaInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NeutronInternal, host]
+              get_param: [EndpointMap, ManilaInternal, host]
             params:
               CLOUDNAME: {get_param: CloudName}
-              IP_ADDRESS: {get_param: NeutronApiVirtualIP}
+              IP_ADDRESS: {get_param: ManilaApiVirtualIP}
         port:
-          get_param: [EndpointMap, NeutronInternal, port]
+          get_param: [EndpointMap, ManilaInternal, port]
         protocol:
-          get_param: [EndpointMap, NeutronInternal, protocol]
+          get_param: [EndpointMap, ManilaInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NeutronInternal, protocol]
+          - - get_param: [EndpointMap, ManilaInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NeutronInternal, host]
+                  get_param: [EndpointMap, ManilaInternal, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: NeutronApiVirtualIP}
+                  IP_ADDRESS: {get_param: ManilaApiVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NeutronInternal, port]
+            - get_param: [EndpointMap, ManilaInternal, port]
+            - /v2/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NeutronInternal, protocol]
+          - - get_param: [EndpointMap, ManilaInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NeutronInternal, host]
+                  get_param: [EndpointMap, ManilaInternal, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: NeutronApiVirtualIP}
+                  IP_ADDRESS: {get_param: ManilaApiVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NeutronInternal, port]
-      NeutronPublic:
+            - get_param: [EndpointMap, ManilaInternal, port]
+      ManilaPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NeutronPublic, host]
+              get_param: [EndpointMap, ManilaPublic, host]
             params:
               CLOUDNAME: {get_param: CloudName}
               IP_ADDRESS: {get_param: PublicVirtualIP}
         port:
-          get_param: [EndpointMap, NeutronPublic, port]
+          get_param: [EndpointMap, ManilaPublic, port]
         protocol:
-          get_param: [EndpointMap, NeutronPublic, protocol]
+          get_param: [EndpointMap, ManilaPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NeutronPublic, protocol]
+          - - get_param: [EndpointMap, ManilaPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NeutronPublic, host]
+                  get_param: [EndpointMap, ManilaPublic, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
                   IP_ADDRESS: {get_param: PublicVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NeutronPublic, port]
+            - get_param: [EndpointMap, ManilaPublic, port]
+            - /v2/%(tenant_id)s
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NeutronPublic, protocol]
+          - - get_param: [EndpointMap, ManilaPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NeutronPublic, host]
+                  get_param: [EndpointMap, ManilaPublic, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
                   IP_ADDRESS: {get_param: PublicVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NeutronPublic, port]
-      NovaAdmin:
-        host:
-          str_replace:
-            template:
-              get_param: [EndpointMap, NovaAdmin, host]
-            params:
-              CLOUDNAME: {get_param: CloudName}
-              IP_ADDRESS: {get_param: NovaApiVirtualIP}
-        port:
-          get_param: [EndpointMap, NovaAdmin, port]
-        protocol:
-          get_param: [EndpointMap, NovaAdmin, protocol]
-        uri:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, NovaAdmin, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, NovaAdmin, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: NovaApiVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, NovaAdmin, port]
-            - /v2.1/%(tenant_id)s
-        uri_no_suffix:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, NovaAdmin, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, NovaAdmin, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: NovaApiVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, NovaAdmin, port]
-      NovaInternal:
+            - get_param: [EndpointMap, ManilaPublic, port]
+      MysqlInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaInternal, host]
+              get_param: [EndpointMap, MysqlInternal, host]
             params:
               CLOUDNAME: {get_param: CloudName}
-              IP_ADDRESS: {get_param: NovaApiVirtualIP}
+              IP_ADDRESS: {get_param: MysqlVirtualIP}
         port:
-          get_param: [EndpointMap, NovaInternal, port]
+          get_param: [EndpointMap, MysqlInternal, port]
         protocol:
-          get_param: [EndpointMap, NovaInternal, protocol]
+          get_param: [EndpointMap, MysqlInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaInternal, protocol]
+          - - get_param: [EndpointMap, MysqlInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaInternal, host]
+                  get_param: [EndpointMap, MysqlInternal, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: NovaApiVirtualIP}
+                  IP_ADDRESS: {get_param: MysqlVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NovaInternal, port]
-            - /v2.1/%(tenant_id)s
+            - get_param: [EndpointMap, MysqlInternal, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaInternal, protocol]
+          - - get_param: [EndpointMap, MysqlInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaInternal, host]
+                  get_param: [EndpointMap, MysqlInternal, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: NovaApiVirtualIP}
+                  IP_ADDRESS: {get_param: MysqlVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NovaInternal, port]
-      NovaPublic:
+            - get_param: [EndpointMap, MysqlInternal, port]
+      MysqlNoBracketsInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaPublic, host]
+              get_param: [EndpointMap, MysqlNoBracketsInternal, host]
             params:
               CLOUDNAME: {get_param: CloudName}
-              IP_ADDRESS: {get_param: PublicVirtualIP}
+              IP_ADDRESS: {get_param: MysqlNoBracketsVirtualIP}
         port:
-          get_param: [EndpointMap, NovaPublic, port]
+          get_param: [EndpointMap, MysqlNoBracketsInternal, port]
         protocol:
-          get_param: [EndpointMap, NovaPublic, protocol]
+          get_param: [EndpointMap, MysqlNoBracketsInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaPublic, protocol]
+          - - get_param: [EndpointMap, MysqlNoBracketsInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaPublic, host]
+                  get_param: [EndpointMap, MysqlNoBracketsInternal, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: PublicVirtualIP}
+                  IP_ADDRESS: {get_param: MysqlNoBracketsVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NovaPublic, port]
-            - /v2.1/%(tenant_id)s
+            - get_param: [EndpointMap, MysqlNoBracketsInternal, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaPublic, protocol]
+          - - get_param: [EndpointMap, MysqlNoBracketsInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaPublic, host]
+                  get_param: [EndpointMap, MysqlNoBracketsInternal, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: PublicVirtualIP}
+                  IP_ADDRESS: {get_param: MysqlNoBracketsVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NovaPublic, port]
-      NovaV3Admin:
+            - get_param: [EndpointMap, MysqlNoBracketsInternal, port]
+      NeutronAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaAdmin, host]
+              get_param: [EndpointMap, NeutronAdmin, host]
             params:
               CLOUDNAME: {get_param: CloudName}
-              IP_ADDRESS: {get_param: NovaApiVirtualIP}
+              IP_ADDRESS: {get_param: NeutronApiVirtualIP}
         port:
-          get_param: [EndpointMap, NovaAdmin, port]
+          get_param: [EndpointMap, NeutronAdmin, port]
         protocol:
-          get_param: [EndpointMap, NovaAdmin, protocol]
+          get_param: [EndpointMap, NeutronAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaAdmin, protocol]
+          - - get_param: [EndpointMap, NeutronAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaAdmin, host]
+                  get_param: [EndpointMap, NeutronAdmin, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: NovaApiVirtualIP}
+                  IP_ADDRESS: {get_param: NeutronApiVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NovaAdmin, port]
-            - /v3
+            - get_param: [EndpointMap, NeutronAdmin, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaAdmin, protocol]
+          - - get_param: [EndpointMap, NeutronAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaAdmin, host]
+                  get_param: [EndpointMap, NeutronAdmin, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: NovaApiVirtualIP}
+                  IP_ADDRESS: {get_param: NeutronApiVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NovaAdmin, port]
-      NovaV3Internal:
+            - get_param: [EndpointMap, NeutronAdmin, port]
+      NeutronInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaInternal, host]
+              get_param: [EndpointMap, NeutronInternal, host]
             params:
               CLOUDNAME: {get_param: CloudName}
-              IP_ADDRESS: {get_param: NovaApiVirtualIP}
+              IP_ADDRESS: {get_param: NeutronApiVirtualIP}
         port:
-          get_param: [EndpointMap, NovaInternal, port]
+          get_param: [EndpointMap, NeutronInternal, port]
         protocol:
-          get_param: [EndpointMap, NovaInternal, protocol]
+          get_param: [EndpointMap, NeutronInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaInternal, protocol]
+          - - get_param: [EndpointMap, NeutronInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaInternal, host]
+                  get_param: [EndpointMap, NeutronInternal, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: NovaApiVirtualIP}
+                  IP_ADDRESS: {get_param: NeutronApiVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NovaInternal, port]
-            - /v3
+            - get_param: [EndpointMap, NeutronInternal, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaInternal, protocol]
+          - - get_param: [EndpointMap, NeutronInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaInternal, host]
+                  get_param: [EndpointMap, NeutronInternal, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: NovaApiVirtualIP}
+                  IP_ADDRESS: {get_param: NeutronApiVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NovaInternal, port]
-      NovaV3Public:
+            - get_param: [EndpointMap, NeutronInternal, port]
+      NeutronPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaPublic, host]
+              get_param: [EndpointMap, NeutronPublic, host]
             params:
               CLOUDNAME: {get_param: CloudName}
               IP_ADDRESS: {get_param: PublicVirtualIP}
         port:
-          get_param: [EndpointMap, NovaPublic, port]
+          get_param: [EndpointMap, NeutronPublic, port]
         protocol:
-          get_param: [EndpointMap, NovaPublic, protocol]
+          get_param: [EndpointMap, NeutronPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaPublic, protocol]
+          - - get_param: [EndpointMap, NeutronPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaPublic, host]
+                  get_param: [EndpointMap, NeutronPublic, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
                   IP_ADDRESS: {get_param: PublicVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NovaPublic, port]
-            - /v3
+            - get_param: [EndpointMap, NeutronPublic, port]
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaPublic, protocol]
+          - - get_param: [EndpointMap, NeutronPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaPublic, host]
+                  get_param: [EndpointMap, NeutronPublic, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
                   IP_ADDRESS: {get_param: PublicVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NovaPublic, port]
-      NovaEC2Admin:
+            - get_param: [EndpointMap, NeutronPublic, port]
+      NovaAdmin:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaEC2Admin, host]
+              get_param: [EndpointMap, NovaAdmin, host]
             params:
               CLOUDNAME: {get_param: CloudName}
               IP_ADDRESS: {get_param: NovaApiVirtualIP}
         port:
-          get_param: [EndpointMap, NovaEC2Admin, port]
+          get_param: [EndpointMap, NovaAdmin, port]
         protocol:
-          get_param: [EndpointMap, NovaEC2Admin, protocol]
+          get_param: [EndpointMap, NovaAdmin, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaEC2Admin, protocol]
+          - - get_param: [EndpointMap, NovaAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaEC2Admin, host]
+                  get_param: [EndpointMap, NovaAdmin, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
                   IP_ADDRESS: {get_param: NovaApiVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NovaEC2Admin, port]
-            - /services/Admin
+            - get_param: [EndpointMap, NovaAdmin, port]
+            - /v2.1
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaEC2Admin, protocol]
+          - - get_param: [EndpointMap, NovaAdmin, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaEC2Admin, host]
+                  get_param: [EndpointMap, NovaAdmin, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
                   IP_ADDRESS: {get_param: NovaApiVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NovaEC2Admin, port]
-      NovaEC2Internal:
+            - get_param: [EndpointMap, NovaAdmin, port]
+      NovaInternal:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaEC2Internal, host]
+              get_param: [EndpointMap, NovaInternal, host]
             params:
               CLOUDNAME: {get_param: CloudName}
               IP_ADDRESS: {get_param: NovaApiVirtualIP}
         port:
-          get_param: [EndpointMap, NovaEC2Internal, port]
+          get_param: [EndpointMap, NovaInternal, port]
         protocol:
-          get_param: [EndpointMap, NovaEC2Internal, protocol]
+          get_param: [EndpointMap, NovaInternal, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaEC2Internal, protocol]
+          - - get_param: [EndpointMap, NovaInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaEC2Internal, host]
+                  get_param: [EndpointMap, NovaInternal, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
                   IP_ADDRESS: {get_param: NovaApiVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NovaEC2Internal, port]
-            - /services/Cloud
+            - get_param: [EndpointMap, NovaInternal, port]
+            - /v2.1
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaEC2Internal, protocol]
+          - - get_param: [EndpointMap, NovaInternal, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaEC2Internal, host]
+                  get_param: [EndpointMap, NovaInternal, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
                   IP_ADDRESS: {get_param: NovaApiVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NovaEC2Internal, port]
-      NovaEC2Public:
+            - get_param: [EndpointMap, NovaInternal, port]
+      NovaPublic:
         host:
           str_replace:
             template:
-              get_param: [EndpointMap, NovaEC2Public, host]
+              get_param: [EndpointMap, NovaPublic, host]
             params:
               CLOUDNAME: {get_param: CloudName}
               IP_ADDRESS: {get_param: PublicVirtualIP}
         port:
-          get_param: [EndpointMap, NovaEC2Public, port]
+          get_param: [EndpointMap, NovaPublic, port]
         protocol:
-          get_param: [EndpointMap, NovaEC2Public, protocol]
+          get_param: [EndpointMap, NovaPublic, protocol]
         uri:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaEC2Public, protocol]
+          - - get_param: [EndpointMap, NovaPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaEC2Public, host]
+                  get_param: [EndpointMap, NovaPublic, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
                   IP_ADDRESS: {get_param: PublicVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NovaEC2Public, port]
-            - /services/Cloud
+            - get_param: [EndpointMap, NovaPublic, port]
+            - /v2.1
         uri_no_suffix:
           list_join:
           - ''
-          - - get_param: [EndpointMap, NovaEC2Public, protocol]
+          - - get_param: [EndpointMap, NovaPublic, protocol]
             - ://
             - str_replace:
                 template:
-                  get_param: [EndpointMap, NovaEC2Public, host]
+                  get_param: [EndpointMap, NovaPublic, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
                   IP_ADDRESS: {get_param: PublicVirtualIP}
             - ':'
-            - get_param: [EndpointMap, NovaEC2Public, port]
+            - get_param: [EndpointMap, NovaPublic, port]
       NovaVNCProxyAdmin:
         host:
           str_replace:
@@ -1740,7 +2217,7 @@ outputs:
               get_param: [EndpointMap, SaharaPublic, host]
             params:
               CLOUDNAME: {get_param: CloudName}
-              IP_ADDRESS: {get_param: SaharaApiVirtualIP}
+              IP_ADDRESS: {get_param: PublicVirtualIP}
         port:
           get_param: [EndpointMap, SaharaPublic, port]
         protocol:
@@ -1755,7 +2232,7 @@ outputs:
                   get_param: [EndpointMap, SaharaPublic, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: SaharaApiVirtualIP}
+                  IP_ADDRESS: {get_param: PublicVirtualIP}
             - ':'
             - get_param: [EndpointMap, SaharaPublic, port]
             - /v1.1/%(tenant_id)s
@@ -1769,7 +2246,7 @@ outputs:
                   get_param: [EndpointMap, SaharaPublic, host]
                 params:
                   CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: SaharaApiVirtualIP}
+                  IP_ADDRESS: {get_param: PublicVirtualIP}
             - ':'
             - get_param: [EndpointMap, SaharaPublic, port]
       SwiftAdmin: