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
This commit is contained in:
parent
bb89de950f
commit
bd318943bb
|
@ -64,6 +64,10 @@ parameters:
|
||||||
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.
|
||||||
type: number
|
type: number
|
||||||
|
{{network.name}}InterfaceDefaultRoute:
|
||||||
|
default: ''
|
||||||
|
description: default route for the {{network.name_lower}} network
|
||||||
|
type: string
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
|
|
|
@ -62,6 +62,10 @@ parameters:
|
||||||
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.
|
||||||
type: number
|
type: number
|
||||||
|
{{network.name}}InterfaceDefaultRoute:
|
||||||
|
default: ''
|
||||||
|
description: default route for the {{network.name_lower}} network
|
||||||
|
type: string
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
|
|
|
@ -25,6 +25,10 @@ parameters:
|
||||||
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.
|
||||||
type: number
|
type: number
|
||||||
|
{{network.name}}InterfaceDefaultRoute:
|
||||||
|
default: ''
|
||||||
|
description: default route for the {{network.name_lower}} network
|
||||||
|
type: string
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
ControlPlaneDefaultRoute:
|
ControlPlaneDefaultRoute:
|
||||||
description: The default route of the control plane network. (The parameter
|
description: The default route of the control plane network. (The parameter
|
||||||
|
|
|
@ -65,6 +65,10 @@ parameters:
|
||||||
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.
|
||||||
type: number
|
type: number
|
||||||
|
{{network.name}}InterfaceDefaultRoute:
|
||||||
|
default: ''
|
||||||
|
description: default route for the {{network.name_lower}} network
|
||||||
|
type: string
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
|
@ -26,6 +26,10 @@ parameters:
|
||||||
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.
|
||||||
type: number
|
type: number
|
||||||
|
{{network.name}}InterfaceDefaultRoute:
|
||||||
|
default: ''
|
||||||
|
description: default route for the {{network.name_lower}} network
|
||||||
|
type: string
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
ControlPlaneSubnetCidr:
|
ControlPlaneSubnetCidr:
|
||||||
default: ''
|
default: ''
|
||||||
|
|
|
@ -26,6 +26,10 @@ parameters:
|
||||||
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.
|
||||||
type: number
|
type: number
|
||||||
|
{{network.name}}InterfaceDefaultRoute:
|
||||||
|
default: ''
|
||||||
|
description: default route for the {{network.name_lower}} network
|
||||||
|
type: string
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
ControlPlaneSubnetCidr:
|
ControlPlaneSubnetCidr:
|
||||||
default: ''
|
default: ''
|
||||||
|
|
|
@ -26,6 +26,10 @@ parameters:
|
||||||
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.
|
||||||
type: number
|
type: number
|
||||||
|
{{network.name}}InterfaceDefaultRoute:
|
||||||
|
default: ''
|
||||||
|
description: default route for the {{network.name_lower}} network
|
||||||
|
type: string
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
ControlPlaneSubnetCidr:
|
ControlPlaneSubnetCidr:
|
||||||
default: ''
|
default: ''
|
||||||
|
|
|
@ -25,6 +25,10 @@ parameters:
|
||||||
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.
|
||||||
type: number
|
type: number
|
||||||
|
{{network.name}}InterfaceDefaultRoute:
|
||||||
|
default: ''
|
||||||
|
description: default route for the {{network.name_lower}} network
|
||||||
|
type: string
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
ControlPlaneSubnetCidr:
|
ControlPlaneSubnetCidr:
|
||||||
default: ''
|
default: ''
|
||||||
|
|
|
@ -26,6 +26,10 @@ parameters:
|
||||||
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.
|
||||||
type: number
|
type: number
|
||||||
|
{{network.name}}InterfaceDefaultRoute:
|
||||||
|
default: ''
|
||||||
|
description: default route for the {{network.name_lower}} network
|
||||||
|
type: string
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
ControlPlaneSubnetCidr:
|
ControlPlaneSubnetCidr:
|
||||||
default: ''
|
default: ''
|
||||||
|
|
Loading…
Reference in New Issue