Add default to network.mtu in j2 in nic configs

Previously all networks was rendered for all roles, and
thus the default set in network/network.j2#L83 would
propgate to the nic config for any role. Since we now
only include properties for network's in role.networks
when passing parameters puppet/role.role.j2.yaml this
default may not propagate to the nic config and can
cause problems if merge-new-params-nic-config-script.py
was used to add new parameters with a role missmatch.

(i.e Updating the Compute roles NIC config file while
specifying the Controller role in  merge-new-params
tool would add the parameter with no default which
causes Property {{network.name}}Mtu not assigned
error when deploying.

Change-Id: I3031977a0daabb093cb8f61bcfc22b68e8e35bed
This commit is contained in:
Harald Jensås 2019-01-07 22:09:27 +01:00
parent c61009a7c2
commit cf333d3a07
21 changed files with 21 additions and 21 deletions

View File

@ -59,7 +59,7 @@ parameters:
description: IP address/subnet on the {{network.name_lower}} network description: IP address/subnet on the {{network.name_lower}} network
type: string type: string
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -57,7 +57,7 @@ parameters:
from the subnet host_routes attribute. from the subnet host_routes attribute.
type: json type: json
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -20,7 +20,7 @@ parameters:
from the subnet host_routes attribute. from the subnet host_routes attribute.
type: json type: json
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -60,7 +60,7 @@ parameters:
from the subnet host_routes attribute. from the subnet host_routes attribute.
type: json type: json
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -21,7 +21,7 @@ parameters:
from the subnet host_routes attribute. from the subnet host_routes attribute.
type: json type: json
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -21,7 +21,7 @@ parameters:
from the subnet host_routes attribute. from the subnet host_routes attribute.
type: json type: json
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -21,7 +21,7 @@ parameters:
from the subnet host_routes attribute. from the subnet host_routes attribute.
type: json type: json
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -20,7 +20,7 @@ parameters:
from the subnet host_routes attribute. from the subnet host_routes attribute.
type: json type: json
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -21,7 +21,7 @@ parameters:
from the subnet host_routes attribute. from the subnet host_routes attribute.
type: json type: json
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -54,7 +54,7 @@ parameters:
description: Vlan ID for the {{network.name_lower}} network traffic. description: Vlan ID for the {{network.name_lower}} network traffic.
type: number type: number
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -45,7 +45,7 @@ parameters:
description: Vlan ID for the {{network.name_lower}} network traffic. description: Vlan ID for the {{network.name_lower}} network traffic.
type: number type: number
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -43,7 +43,7 @@ parameters:
description: Vlan ID for the {{network.name_lower}} network traffic. description: Vlan ID for the {{network.name_lower}} network traffic.
type: number type: number
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -52,7 +52,7 @@ parameters:
description: Vlan ID for the {{network.name_lower}} network traffic. description: Vlan ID for the {{network.name_lower}} network traffic.
type: number type: number
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -43,7 +43,7 @@ parameters:
description: Vlan ID for the {{network.name_lower}} network traffic. description: Vlan ID for the {{network.name_lower}} network traffic.
type: number type: number
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -42,7 +42,7 @@ parameters:
description: Vlan ID for the {{network.name_lower}} network traffic. description: Vlan ID for the {{network.name_lower}} network traffic.
type: number type: number
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -52,7 +52,7 @@ parameters:
description: Vlan ID for the {{network.name_lower}} network traffic. description: Vlan ID for the {{network.name_lower}} network traffic.
type: number type: number
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -42,7 +42,7 @@ parameters:
description: Vlan ID for the {{network.name_lower}} network traffic. description: Vlan ID for the {{network.name_lower}} network traffic.
type: number type: number
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -52,7 +52,7 @@ parameters:
description: Vlan ID for the {{network.name_lower}} network traffic. description: Vlan ID for the {{network.name_lower}} network traffic.
type: number type: number
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -45,7 +45,7 @@ parameters:
description: Vlan ID for the {{network.name_lower}} network traffic. description: Vlan ID for the {{network.name_lower}} network traffic.
type: number type: number
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -42,7 +42,7 @@ parameters:
description: Vlan ID for the {{network.name_lower}} network traffic. description: Vlan ID for the {{network.name_lower}} network traffic.
type: number type: number
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.

View File

@ -52,7 +52,7 @@ parameters:
description: Vlan ID for the {{network.name_lower}} network traffic. description: Vlan ID for the {{network.name_lower}} network traffic.
type: number type: number
{{network.name}}Mtu: {{network.name}}Mtu:
default: {{network.mtu}} default: {{network.mtu|default('1500')}}
description: The maximum transmission unit (MTU) size(in bytes) that is description: The maximum transmission unit (MTU) size(in bytes) that is
guaranteed to pass through the data path of the segments in the guaranteed to pass through the data path of the segments in the
{{network.name}} network. {{network.name}} network.