2015-07-08 14:49:51 +00:00
|
|
|
# This template configures each role to use Vlans on a single nic for
|
|
|
|
# each isolated network.
|
|
|
|
# This template assumes use of network-isolation.yaml and should be specified
|
|
|
|
# last on the CLI as a Heat environment so as to override specific
|
|
|
|
# registry settings in the network-isolation registry.
|
|
|
|
#
|
|
|
|
# FIXME: if/when we add functionality to heatclient to include heat
|
|
|
|
# environment files we should think about using it here to automatically
|
|
|
|
# include network-isolation.yaml.
|
|
|
|
resource_registry:
|
|
|
|
|
|
|
|
# Set external ports to noop
|
2016-04-07 23:27:57 +00:00
|
|
|
OS::TripleO::Network::External: OS::Heat::None
|
2015-07-08 14:49:51 +00:00
|
|
|
OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/noop.yaml
|
|
|
|
|
|
|
|
# Configure other ports as normal
|
Render NIC config templates with jinja2
This change converts the existing NIC templates to jinja2 in
order to dynamically render the ports and networks according
to the network_data.yaml. If networks are added to the
network_data.yaml file, parameters will be added to all
NIC templates. The YAML files (as output from jinja with
the default network_data.yaml) are present as an example.
The roles in roles_data.yaml are used to produce NIC configs
for the standard and custom composable roles. In order to
keep the ordering of NICs the same in the multiple-nics
templates, the order of networks was changed in the
network_data.yaml file. This is reflected in the network
templates, and in some of the files that is the only
change.
The roles and roles_data.yaml were modified to include
a legacy name for the NIC config templates for the
built-in roles Controller, Compute, Object Storage,
Block Storage, Ceph Storage, Compute-DPDK, and
Networker roles. There will now be a file produced
with the legacy name, but also one produced with the
<role>-role.j2.yaml format (along with environment
files to help use the new filenames).
Note this change also fixes some typos as well as
a number of templates that had VLANs with device:
entries which were ignored.
Closes-Bug: 1737041
Depends-On: I49c0245c36de3103671080fd1c8cfb3432856f35
Change-Id: I3bdb7d00dab5a023dd8b9c94c0f89f84357ae7a4
2017-11-29 01:00:59 +00:00
|
|
|
{%- for role in roles if role.name != "Controller" %}
|
|
|
|
# Port assignments for the {{role.name}}
|
2018-03-05 16:01:08 +00:00
|
|
|
OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
|
Render NIC config templates with jinja2
This change converts the existing NIC templates to jinja2 in
order to dynamically render the ports and networks according
to the network_data.yaml. If networks are added to the
network_data.yaml file, parameters will be added to all
NIC templates. The YAML files (as output from jinja with
the default network_data.yaml) are present as an example.
The roles in roles_data.yaml are used to produce NIC configs
for the standard and custom composable roles. In order to
keep the ordering of NICs the same in the multiple-nics
templates, the order of networks was changed in the
network_data.yaml file. This is reflected in the network
templates, and in some of the files that is the only
change.
The roles and roles_data.yaml were modified to include
a legacy name for the NIC config templates for the
built-in roles Controller, Compute, Object Storage,
Block Storage, Ceph Storage, Compute-DPDK, and
Networker roles. There will now be a file produced
with the legacy name, but also one produced with the
<role>-role.j2.yaml format (along with environment
files to help use the new filenames).
Note this change also fixes some typos as well as
a number of templates that had VLANs with device:
entries which were ignored.
Closes-Bug: 1737041
Depends-On: I49c0245c36de3103671080fd1c8cfb3432856f35
Change-Id: I3bdb7d00dab5a023dd8b9c94c0f89f84357ae7a4
2017-11-29 01:00:59 +00:00
|
|
|
{%- endfor %}
|
|
|
|
|
|
|
|
# FIXME this should really be handled via enabled networks in roles_data not overriding here.
|
2015-07-08 14:49:51 +00:00
|
|
|
OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/single-nic-vlans/controller-no-external.yaml
|