X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=network%2Fservice_net_map.j2.yaml;h=dfb0e9104d8184040e1c25323251546fdeab4594;hb=c95a8a5d1006571f1b6a1e43ac2400fa81237216;hp=d3d8cbdb37ad8ac98929154b7429d9f791fc1bb8;hpb=e797c0321b7758dd9a5554af2ea275c47df2a448;p=apex-tripleo-heat-templates.git

diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml
index d3d8cbdb..dfb0e910 100644
--- a/network/service_net_map.j2.yaml
+++ b/network/service_net_map.j2.yaml
@@ -42,7 +42,7 @@ parameters:
       CinderApiNetwork: internal_api
       CinderIscsiNetwork: storage
       CongressApiNetwork: internal_api
-      GlanceApiNetwork: storage
+      GlanceApiNetwork: internal_api
       IronicApiNetwork: ctlplane
       IronicNetwork: ctlplane
       IronicInspectorNetwork: ctlplane
@@ -55,7 +55,6 @@ parameters:
       HeatApiCfnNetwork: internal_api
       HeatApiCloudwatchNetwork: internal_api
       NovaApiNetwork: internal_api
-      NovaColdMigrationNetwork: ctlplane
       NovaPlacementNetwork: internal_api
       NovaMetadataNetwork: internal_api
       NovaVncProxyNetwork: internal_api
@@ -104,31 +103,12 @@ parameters:
                  internal use only, this will be removed in future.
     type: json
 
-  InternalApiNetName:
-    default: internal_api
-    description: The name of the internal API network.
+{%- for network in networks %}
+  {{network.name}}NetName:
+    default: {{network.name_lower}}
+    description: The name of the {{network.name_lower}} network.
     type: string
-  ExternalNetName:
-    default: external
-    description: The name of the external network.
-    type: string
-  ManagementNetName:
-    default: management
-    description: The name of the management network.
-    type: string
-  StorageNetName:
-    default: storage
-    description: The name of the storage network.
-    type: string
-  StorageMgmtNetName:
-    default: storage_mgmt
-    description: The name of the Storage management network.
-    type: string
-  TenantNetName:
-    default: tenant
-    description: The name of the tenant network.
-    type: string
-
+{%- endfor %}
 
 parameter_groups:
 - label: deprecated
@@ -146,12 +126,9 @@ resources:
           - map_replace:
              - {get_param: ServiceNetMapDefaults}
              - values:
-                 external: {get_param: ExternalNetName}
-                 internal_api: {get_param: InternalApiNetName}
-                 storage: {get_param: StorageNetName}
-                 storage_mgmt: {get_param: StorageMgmtNetName}
-                 tenant: {get_param: TenantNetName}
-                 management: {get_param: ManagementNetName}
+{%- for network in networks %}
+                 {{network.name_lower}}: {get_param: {{network.name}}NetName}
+{%- endfor %}
           - map_replace:
              - {get_param: ServiceNetMap}
              - keys: {get_param: ServiceNetMapDeprecatedMapping}