Browse Source

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
changes/48/629048/1
Harald Jensås 3 years ago
parent
commit
cf333d3a07
  1. 2
      net-config-bond.j2.yaml
  2. 2
      net-config-bridge.j2.yaml
  3. 2
      net-config-linux-bridge.j2.yaml
  4. 2
      net-config-noop.j2.yaml
  5. 2
      net-config-standalone.j2.yaml
  6. 2
      net-config-static-bridge-with-external-dhcp.j2.yaml
  7. 2
      net-config-static-bridge.j2.yaml
  8. 2
      net-config-static.j2.yaml
  9. 2
      net-config-undercloud.j2.yaml
  10. 2
      network/config/2-linux-bonds-vlans/role.role.j2.yaml
  11. 2
      network/config/bond-with-vlans/controller-no-external.j2.yaml
  12. 2
      network/config/bond-with-vlans/controller-v6.j2.yaml
  13. 2
      network/config/bond-with-vlans/role.role.j2.yaml
  14. 2
      network/config/multiple-nics/compute-dvr.j2.yaml
  15. 2
      network/config/multiple-nics/controller-v6.j2.yaml
  16. 2
      network/config/multiple-nics/role.role.j2.yaml
  17. 2
      network/config/single-nic-linux-bridge-vlans/controller-v6.j2.yaml
  18. 2
      network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml
  19. 2
      network/config/single-nic-vlans/controller-no-external.j2.yaml
  20. 2
      network/config/single-nic-vlans/controller-v6.j2.yaml
  21. 2
      network/config/single-nic-vlans/role.role.j2.yaml

2
net-config-bond.j2.yaml

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

2
net-config-bridge.j2.yaml

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

2
net-config-linux-bridge.j2.yaml

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

2
net-config-noop.j2.yaml

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

2
net-config-standalone.j2.yaml

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

2
net-config-static-bridge-with-external-dhcp.j2.yaml

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

2
net-config-static-bridge.j2.yaml

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

2
net-config-static.j2.yaml

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

2
net-config-undercloud.j2.yaml

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

2
network/config/2-linux-bonds-vlans/role.role.j2.yaml

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

2
network/config/bond-with-vlans/controller-no-external.j2.yaml

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

2
network/config/bond-with-vlans/controller-v6.j2.yaml

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

2
network/config/bond-with-vlans/role.role.j2.yaml

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

2
network/config/multiple-nics/compute-dvr.j2.yaml

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

2
network/config/multiple-nics/controller-v6.j2.yaml

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

2
network/config/multiple-nics/role.role.j2.yaml

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

2
network/config/single-nic-linux-bridge-vlans/controller-v6.j2.yaml

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

2
network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml

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

2
network/config/single-nic-vlans/controller-no-external.j2.yaml

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

2
network/config/single-nic-vlans/controller-v6.j2.yaml

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

2
network/config/single-nic-vlans/role.role.j2.yaml

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

Loading…
Cancel
Save