diff --git a/environments/network-environment-v6.j2.yaml b/environments/network-environment-v6.j2.yaml index e632f4c140..9a4068a38d 100644 --- a/environments/network-environment-v6.j2.yaml +++ b/environments/network-environment-v6.j2.yaml @@ -44,7 +44,7 @@ parameter_defaults: # Customize the IP range to use for static IPs and VIPs {{network.name}}AllocationPools: {{network.allocation_pools}} {%- endif %} -{%- if network.enabled|default(true) and network.gateway_ipv6|default(false) %} +{%- if network.gateway_ipv6|default(false) %} # Gateway router for routable networks {{network.name}}InterfaceDefaultRoute: '{{network.gateway_ipv6}}' {%- endif %} @@ -52,7 +52,7 @@ parameter_defaults: # Customize the VLAN ID to match the local environment {{network.name}}NetworkVlanID: {{network.vlan}} {%- endif %} -{%- if network.enabled|default(true) and network.routes_ipv6 %} +{%- if network.routes_ipv6 %} # Routes to add to host_routes property of the subnets in neutron. {{network.name}}Routes: {{network.routes_ipv6|default([])}} {%- endif %} diff --git a/environments/network-environment.j2.yaml b/environments/network-environment.j2.yaml index a4da2901ae..012a787c89 100644 --- a/environments/network-environment.j2.yaml +++ b/environments/network-environment.j2.yaml @@ -50,7 +50,7 @@ parameter_defaults: # Customize the VLAN ID to match the local environment {{network.name}}NetworkVlanID: {{network.vlan}} {%- endif %} -{%- if network.enabled|default(true) and network.routes %} +{%- if network.routes %} # Routes to add to host_routes property of the subnets in neutron. {{network.name}}Routes: {{network.routes|default([])}} {%- endif %}