Browse Source

Add %network%InterfaceDefaultRoute for compatibility

Since https://review.openstack.org/645039, parameter
ExternalInterfaceDefaultRoute is passed to nic config
templates for roles with the default setting for
controller nodes 'default_route_networks: ['External']'
in roles data.

Add the parameter with '' default in tht/net-config-*
templates for compatibility.

Change-Id: I0f1a0893b6d3d400f51b218ae74ec64d876e0115
changes/38/647738/1
Harald Jensås 3 years ago
parent
commit
bd318943bb
  1. 4
      net-config-bond.j2.yaml
  2. 4
      net-config-bridge.j2.yaml
  3. 4
      net-config-linux-bridge.j2.yaml
  4. 4
      net-config-noop.j2.yaml
  5. 4
      net-config-standalone.j2.yaml
  6. 4
      net-config-static-bridge-with-external-dhcp.j2.yaml
  7. 4
      net-config-static-bridge.j2.yaml
  8. 4
      net-config-static.j2.yaml
  9. 4
      net-config-undercloud.j2.yaml

4
net-config-bond.j2.yaml

@ -64,6 +64,10 @@ parameters:
guaranteed to pass through the data path of the segments in the
{{network.name}} network.
type: number
{{network.name}}InterfaceDefaultRoute:
default: ''
description: default route for the {{network.name_lower}} network
type: string
{%- endfor %}
resources:
OsNetConfigImpl:

4
net-config-bridge.j2.yaml

@ -62,6 +62,10 @@ parameters:
guaranteed to pass through the data path of the segments in the
{{network.name}} network.
type: number
{{network.name}}InterfaceDefaultRoute:
default: ''
description: default route for the {{network.name_lower}} network
type: string
{%- endfor %}
resources:
OsNetConfigImpl:

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

@ -25,6 +25,10 @@ parameters:
guaranteed to pass through the data path of the segments in the
{{network.name}} network.
type: number
{{network.name}}InterfaceDefaultRoute:
default: ''
description: default route for the {{network.name_lower}} network
type: string
{%- endfor %}
ControlPlaneDefaultRoute:
description: The default route of the control plane network. (The parameter

4
net-config-noop.j2.yaml

@ -65,6 +65,10 @@ parameters:
guaranteed to pass through the data path of the segments in the
{{network.name}} network.
type: number
{{network.name}}InterfaceDefaultRoute:
default: ''
description: default route for the {{network.name_lower}} network
type: string
{%- endfor %}
resources:

4
net-config-standalone.j2.yaml

@ -26,6 +26,10 @@ parameters:
guaranteed to pass through the data path of the segments in the
{{network.name}} network.
type: number
{{network.name}}InterfaceDefaultRoute:
default: ''
description: default route for the {{network.name_lower}} network
type: string
{%- endfor %}
ControlPlaneSubnetCidr:
default: ''

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

@ -26,6 +26,10 @@ parameters:
guaranteed to pass through the data path of the segments in the
{{network.name}} network.
type: number
{{network.name}}InterfaceDefaultRoute:
default: ''
description: default route for the {{network.name_lower}} network
type: string
{%- endfor %}
ControlPlaneSubnetCidr:
default: ''

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

@ -26,6 +26,10 @@ parameters:
guaranteed to pass through the data path of the segments in the
{{network.name}} network.
type: number
{{network.name}}InterfaceDefaultRoute:
default: ''
description: default route for the {{network.name_lower}} network
type: string
{%- endfor %}
ControlPlaneSubnetCidr:
default: ''

4
net-config-static.j2.yaml

@ -25,6 +25,10 @@ parameters:
guaranteed to pass through the data path of the segments in the
{{network.name}} network.
type: number
{{network.name}}InterfaceDefaultRoute:
default: ''
description: default route for the {{network.name_lower}} network
type: string
{%- endfor %}
ControlPlaneSubnetCidr:
default: ''

4
net-config-undercloud.j2.yaml

@ -26,6 +26,10 @@ parameters:
guaranteed to pass through the data path of the segments in the
{{network.name}} network.
type: number
{{network.name}}InterfaceDefaultRoute:
default: ''
description: default route for the {{network.name_lower}} network
type: string
{%- endfor %}
ControlPlaneSubnetCidr:
default: ''

Loading…
Cancel
Save