Code Review / apex-tripleo-heat-templates.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Merge "Change ping wait flag"
[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 07266f9..d1c8fbe 100644 (file)
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -12,6 +12,8 @@ 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: ''}
   KeystoneAdminApiVirtualIP: {type: string, default: ''}
   KeystonePublicApiVirtualIP: {type: string, default: ''}
@@ -36,6 +38,10 @@ 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}
@@ -43,18 +49,12 @@ parameters:
       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}
       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}
@@ -647,6 +647,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:
@@ -963,119 +1115,119 @@ 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]
+            - get_param: [EndpointMap, KeystonePublic, port]
       NeutronAdmin:
         host:
           str_replace:
@@ -1307,123 +1459,6 @@ outputs:
                   IP_ADDRESS: {get_param: PublicVirtualIP}
             - ':'
             - get_param: [EndpointMap, NovaPublic, port]
-      NovaEC2Admin:
-        host:
-          str_replace:
-            template:
-              get_param: [EndpointMap, NovaEC2Admin, host]
-            params:
-              CLOUDNAME: {get_param: CloudName}
-              IP_ADDRESS: {get_param: NovaApiVirtualIP}
-        port:
-          get_param: [EndpointMap, NovaEC2Admin, port]
-        protocol:
-          get_param: [EndpointMap, NovaEC2Admin, protocol]
-        uri:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, NovaEC2Admin, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, NovaEC2Admin, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: NovaApiVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, NovaEC2Admin, port]
-            - /services/Admin
-        uri_no_suffix:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, NovaEC2Admin, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, NovaEC2Admin, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: NovaApiVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, NovaEC2Admin, port]
-      NovaEC2Internal:
-        host:
-          str_replace:
-            template:
-              get_param: [EndpointMap, NovaEC2Internal, host]
-            params:
-              CLOUDNAME: {get_param: CloudName}
-              IP_ADDRESS: {get_param: NovaApiVirtualIP}
-        port:
-          get_param: [EndpointMap, NovaEC2Internal, port]
-        protocol:
-          get_param: [EndpointMap, NovaEC2Internal, protocol]
-        uri:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, NovaEC2Internal, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, NovaEC2Internal, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: NovaApiVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, NovaEC2Internal, port]
-            - /services/Cloud
-        uri_no_suffix:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, NovaEC2Internal, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, NovaEC2Internal, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: NovaApiVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, NovaEC2Internal, port]
-      NovaEC2Public:
-        host:
-          str_replace:
-            template:
-              get_param: [EndpointMap, NovaEC2Public, host]
-            params:
-              CLOUDNAME: {get_param: CloudName}
-              IP_ADDRESS: {get_param: PublicVirtualIP}
-        port:
-          get_param: [EndpointMap, NovaEC2Public, port]
-        protocol:
-          get_param: [EndpointMap, NovaEC2Public, protocol]
-        uri:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, NovaEC2Public, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, NovaEC2Public, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: PublicVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, NovaEC2Public, port]
-            - /services/Cloud
-        uri_no_suffix:
-          list_join:
-          - ''
-          - - get_param: [EndpointMap, NovaEC2Public, protocol]
-            - ://
-            - str_replace:
-                template:
-                  get_param: [EndpointMap, NovaEC2Public, host]
-                params:
-                  CLOUDNAME: {get_param: CloudName}
-                  IP_ADDRESS: {get_param: PublicVirtualIP}
-            - ':'
-            - get_param: [EndpointMap, NovaEC2Public, port]
       NovaVNCProxyAdmin:
         host:
           str_replace:
@@ -1623,7 +1658,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:
@@ -1638,7 +1673,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
@@ -1652,7 +1687,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: