From: Tim Rozet <trozet@redhat.com>
Date: Mon, 2 Oct 2017 15:52:56 +0000 (-0400)
Subject: Fixes missing type for heat param TenantNetName
X-Git-Tag: opnfv-6.0.0~82^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8ad75087cf6f7f315b0643d4702e8b724f5c41d6;p=apex-tripleo-heat-templates.git

Fixes missing type for heat param TenantNetName

Closes-Bug: 1720823

Change-Id: I239cc9f827fe99a553f9c18b80336bc6ce0b1d14
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit ba5436099d37898e418406f8b4376923e14f4c89)
---

diff --git a/network/ports/net_ip_list_map.j2.yaml b/network/ports/net_ip_list_map.j2.yaml
index e929ab2c..16bd3986 100644
--- a/network/ports/net_ip_list_map.j2.yaml
+++ b/network/ports/net_ip_list_map.j2.yaml
@@ -21,30 +21,6 @@ parameters:
   NetworkHostnameMap:
     default: []
     type: json
-
-  InternalApiNetName:
-    default: internal_api
-    description: The name of the internal_api 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_mgmt network.
-    type: string
-  TenantNetName:
-    default: tenant
-    description: The name of the tenant network.
 {%- for network in networks %}
   {{network.name}}NetName:
     default: {{network.name_lower}}
diff --git a/releasenotes/notes/fix-tenant-net-name-type-94a9c50c86529001.yaml b/releasenotes/notes/fix-tenant-net-name-type-94a9c50c86529001.yaml
new file mode 100644
index 00000000..77d9d52f
--- /dev/null
+++ b/releasenotes/notes/fix-tenant-net-name-type-94a9c50c86529001.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Removes hardcoded network names.  The networks are
+    now defined dynamically by network_data.yaml.