aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-10-07 05:05:25 +0000
committerGerrit Code Review <review@openstack.org>2017-10-07 05:05:25 +0000
commite283f1c6f5a0a72fc941a97b385bf927248fe8e8 (patch)
treeacc1e409fcf9fb2e399b8b952a937d7823720a4c
parent36c52d62c5e27f20ffd86a9f9635bd1847f3116a (diff)
parent8ad75087cf6f7f315b0643d4702e8b724f5c41d6 (diff)
Merge "Fixes missing type for heat param TenantNetName" into stable/pike
-rw-r--r--network/ports/net_ip_list_map.j2.yaml24
-rw-r--r--releasenotes/notes/fix-tenant-net-name-type-94a9c50c86529001.yaml5
2 files changed, 5 insertions, 24 deletions
diff --git a/network/ports/net_ip_list_map.j2.yaml b/network/ports/net_ip_list_map.j2.yaml
index e929ab2..16bd398 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 0000000..77d9d52
--- /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.