Commit Graph

5 Commits

Author SHA1 Message Date
Rabi Mishra
e9e0eb3d97 Make NetworkConfigWithAnsible parameter non-role specific
This changes the parameter to non-role specific and by default
true. The dependant python-tripleoclient patch adds a check
to ensure that we only allow usage of old heat nic congigs with
'NetworkConfigWithAnsible: false'.

Change-Id: Ie37bdfe64eb1b33afe326161fc6f99601addb7b5
2020-10-15 19:41:27 +05:30
Rabi Mishra
6de80864af Use native ansible for nic configuration in some envs
This changes the following environments
- net-multiple-nics.j2.yaml
- net-multiple-nics-vlans.j2.yaml
- net-single-nic-with-vlans.j2.yaml
- net-single-nic-with-vlans-no-external.j2.yaml

Change-Id: I4713ffc15c9be0f303790ae29910f7d2738cfae8
2020-10-15 12:57:42 +05:30
Dan Sneddon
e645d2e753 Fix comments in environments/net-* network configuration envs
The environment files that select which network configuration files
to use for a deployment have an incorrect comment. The comment
mentions port configurations above the network configuration
templates. This patch corrects the comments.

Change-Id: Idb5c09f7c803a89d388e4458b032bbebd4b2590b
Closes-bug: 1822693
2019-04-01 17:12:28 -07:00
Jiri Stransky
096b5d973e Fix default nic config file names
Use the jinja2 string concatenation operator. The issue affected only
cases where roles in roles_data.yaml didn't have
deprecated_nic_config_name defined.

Closes-Bug: #1752808
Change-Id: I452fe5f387732114d4c4ab8951f03622931ed780
2018-03-06 17:49:56 +01:00
Dan Sneddon
1dec175241 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
2018-02-13 00:19:37 -08:00