Browse Source

Add {{network.name}}NetworkVlanID to THT/net-config-*

With the default network_data.yaml and default roles_data.yaml
all composable networks are included. When deploying plain
defaults without any network-isolation, i.e ctlplane network
only the jinja2 rendered templates still include all the nets.

With change: https://review.openstack.org/645159 the vlan
parameter is passed to NIC configs for all networks enabled
for the role in roles data if networks data define a vlan id.

Because of this we need to add the parameter to the nic config
template unless networks data and roles data are customized.
(i.e networks that are'nt actually used are removed from the
roles data and networks data.)

Closes-Bug: #1823997
Change-Id: Ic5fe9c8097de814ce3ad7032f42b31859051f70a
changes/81/651381/1
Harald Jensås 3 years ago
parent
commit
56a51647c3
  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-static-bridge-with-external-dhcp.j2.yaml
  6. 4
      net-config-static-bridge.j2.yaml
  7. 4
      net-config-static.j2.yaml

4
net-config-bond.j2.yaml

@ -68,6 +68,10 @@ parameters:
default: ''
description: default route for the {{network.name_lower}} network
type: string
{{network.name}}NetworkVlanID:
default: {{network.vlan|default(1)}}
description: Vlan ID for the {{network.name_lower}} network traffic.
type: number
{%- endfor %}
resources:
OsNetConfigImpl:

4
net-config-bridge.j2.yaml

@ -66,6 +66,10 @@ parameters:
default: ''
description: default route for the {{network.name_lower}} network
type: string
{{network.name}}NetworkVlanID:
default: {{network.vlan|default(1)}}
description: Vlan ID for the {{network.name_lower}} network traffic.
type: number
{%- endfor %}
resources:
OsNetConfigImpl:

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

@ -29,6 +29,10 @@ parameters:
default: ''
description: default route for the {{network.name_lower}} network
type: string
{{network.name}}NetworkVlanID:
default: {{network.vlan|default(1)}}
description: Vlan ID for the {{network.name_lower}} network traffic.
type: number
{%- endfor %}
ControlPlaneDefaultRoute:
description: The default route of the control plane network. (The parameter

4
net-config-noop.j2.yaml

@ -69,6 +69,10 @@ parameters:
default: ''
description: default route for the {{network.name_lower}} network
type: string
{{network.name}}NetworkVlanID:
default: {{network.vlan|default(1)}}
description: Vlan ID for the {{network.name_lower}} network traffic.
type: number
{%- endfor %}
resources:

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

@ -30,6 +30,10 @@ parameters:
default: ''
description: default route for the {{network.name_lower}} network
type: string
{{network.name}}NetworkVlanID:
default: {{network.vlan|default(1)}}
description: Vlan ID for the {{network.name_lower}} network traffic.
type: number
{%- endfor %}
ControlPlaneSubnetCidr:
default: ''

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

@ -30,6 +30,10 @@ parameters:
default: ''
description: default route for the {{network.name_lower}} network
type: string
{{network.name}}NetworkVlanID:
default: {{network.vlan|default(1)}}
description: Vlan ID for the {{network.name_lower}} network traffic.
type: number
{%- endfor %}
ControlPlaneSubnetCidr:
default: ''

4
net-config-static.j2.yaml

@ -29,6 +29,10 @@ parameters:
default: ''
description: default route for the {{network.name_lower}} network
type: string
{{network.name}}NetworkVlanID:
default: {{network.vlan|default(1)}}
description: Vlan ID for the {{network.name_lower}} network traffic.
type: number
{%- endfor %}
ControlPlaneSubnetCidr:
default: ''

Loading…
Cancel
Save