aboutsummaryrefslogtreecommitdiffstats
path: root/network
diff options
context:
space:
mode:
Diffstat (limited to 'network')
-rw-r--r--network/networks.j2.yaml6
-rw-r--r--network/ports/net_ip_list_map.j2.yaml24
2 files changed, 2 insertions, 28 deletions
diff --git a/network/networks.j2.yaml b/network/networks.j2.yaml
index 48c509d..1a17004 100644
--- a/network/networks.j2.yaml
+++ b/network/networks.j2.yaml
@@ -4,8 +4,7 @@ description: Create networks to split out Overcloud traffic
resources:
{%- for network in networks %}
- {%- set network_name = network.compat_name|default(network.name) %}
- {{network_name}}Network:
+ {{network.name}}Network:
type: OS::TripleO::Network::{{network.name}}
{%- endfor %}
@@ -19,9 +18,8 @@ outputs:
# NOTE(gfidente): we need to replace the null value with a
# string to work around https://bugs.launchpad.net/heat/+bug/1700025
{%- for network in networks %}
- {%- set network_name = network.compat_name|default(network.name) %}
{{network.name_lower}}:
yaql:
- data: {get_attr: [{{network_name}}Network, subnet_cidr]}
+ data: {get_attr: [{{network.name}}Network, subnet_cidr]}
expression: str($.data).replace('null', 'disabled')
{%- endfor %}
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}}