Browse Source

Merge "Adding support for ComputeLiquidio role in Network jinja file. Since Liquidio compute nodes contain Liquidio smart NIC, tenant network ip is assigned in the smart NIC instead of Compute node."

changes/82/547682/1
Zuul 4 years ago committed by Gerrit Code Review
parent
commit
6894552a0d
  1. 4
      network/config/multiple-nics/role.role.j2.yaml
  2. 3
      network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml
  3. 2
      roles/ComputeLiquidio.yaml
  4. 4
      roles/README.rst

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

@ -84,7 +84,7 @@ resources:
get_param: ControlPlaneDefaultRoute
{%- endif %}
{%- set nics_used = [1] %}
{%- for network in networks %}
{%- for network in networks if network.name not in role.networks_skip_config|default([]) %}
{%- if network.name not in ["External", "Tenant"] %}
{%- if network.name in role.networks %}
- type: interface
@ -149,4 +149,4 @@ outputs:
OS::stack_id:
description: The OsNetConfigImpl resource.
value:
get_resource: OsNetConfigImpl
get_resource: OsNetConfigImpl

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

@ -81,7 +81,8 @@ resources:
- type: interface
name: interface_name
primary: true
{%- for network in networks if network.enabled|default(true) and network.name in role.networks %}
{%- for network in networks if network.enabled|default(true) and network.name in role.networks
and network.name not in role.networks_skip_config|default([]) %}
- type: vlan
vlan_id:
get_param: {{network.name}}NetworkVlanID

2
roles/ComputeLiquidio.yaml

@ -9,6 +9,8 @@
- InternalApi
- Tenant
- Storage
networks_skip_config:
- Tenant
HostnameFormatDefault: '%stackname%-lionovacompute-%index%'
ServicesDefault:
- OS::TripleO::Services::Aide

4
roles/README.rst

@ -72,6 +72,10 @@ Role Options
access to when network isolation is enabled. The names should match
those defined in network_data.yaml.
* networks_skip_config: (list), optional list of networks for which the
configuration would be skipped for the role. The names should match
those defined in network_data.yaml
Working with Roles
==================
The tripleoclient provides a series of commands that can be used to view

Loading…
Cancel
Save