8 Commits

Author SHA1 Message Date
Carlos Camacho
44ef2a3ec1 Change template names to rocky
The new master branch should point now to rocky.

So, HOT templates should specify that they might contain features
for rocky release [1]

Also, this submission updates the yaml validation to use only latest
heat_version alias. There are cases in which we will need to set
the version for specific templates i.e. mixed versions, so there
is added a variable to assign specific templates to specific heat_version
aliases, avoiding the introductions of error by bulk replacing the
the old version in new releases.

[1]: https://docs.openstack.org/heat/latest/template_guide/hot_spec.html#rocky
Change-Id: Ib17526d9cc453516d99d4659ee5fa51a5aa7fb4b
2018-05-09 08:28:42 +02:00
Dan Prince
3267386674 Add parameter for UndercloudNetConfigOverride
This can be used to inject a custom Json blob containing
os-net-config template data for the Undercloud installation.
The intent is to be able to use this alongside of the
net_config_override setting in tripleoclient when installing
the undercloud.

Change-Id: I322570ae958f8e483b8b2a0ad40d1ee83d084372
2018-05-02 08:06:36 +00:00
Harald Jensas
e947c7e610 Add ctlplane networking for routed networks
* Add a new post install software deployment which runs
a python script to configure the undercloud control
plane network. Replaces section in post shell script.

Change-Id: I1cd594564d1628a6e1fccb9eadf18b716ccc5c72
2018-03-29 23:32:45 +00:00
Harald Jensas
9c4cb2055d Add static routes for routed ctlplane
Add static routes to non-local subnets on the ctlplane
network.

Depends-On: I5fbac0c4a75ad2fb719bfd10887778c8eaeacfd6
Change-Id: I43f8fc0aa150f9470e67c8c16a14273abc749c00
2018-03-29 15:22:53 +02:00
Zuul
662a54491a Merge "Add ovs_extra netconfig for undercloud CI compat" 2018-03-06 00:55:47 +00:00
Bogdan Dobrelya
5ab9f4c012 Add ovs_extra netconfig for undercloud CI compat
Undercloud configured with heat installer uses
net-config-simple-bridge.yaml . In order to switch it to
net-config-undercloud.yaml and maintain features parity
of the latter with the former, add the missing ovs_extra
data.

Change-Id: I1cf559416e8e48d61f320ee4d4299b4bdc3d6fb7
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
2018-03-05 17:46:36 +01:00
Dan Prince
92b4bb8afb Add UndercloudLocalMtu parameter
Change-Id: I638aef1cf18137692a40ccf7d81c37fed9ab81d9
2018-03-05 09:02:38 +00: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