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."

This commit is contained in:
Zuul 2018-02-23 18:44:10 +00:00 committed by Gerrit Code Review
commit 6894552a0d
4 changed files with 10 additions and 3 deletions

View File

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

View File

@ -81,7 +81,8 @@ resources:
- type: interface - type: interface
name: interface_name name: interface_name
primary: true 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 - type: vlan
vlan_id: vlan_id:
get_param: {{network.name}}NetworkVlanID get_param: {{network.name}}NetworkVlanID

View File

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

View File

@ -72,6 +72,10 @@ Role Options
access to when network isolation is enabled. The names should match access to when network isolation is enabled. The names should match
those defined in network_data.yaml. 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 Working with Roles
================== ==================
The tripleoclient provides a series of commands that can be used to view The tripleoclient provides a series of commands that can be used to view