6 Commits

Author SHA1 Message Date
Zuul
9727a0d813 Merge "Render NIC config templates with jinja2" 2018-02-14 05:54:31 +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
Brad P. Crochet
5d81257224 Add Mistral to the provided controller roles
Mistral is not in the provided controller roles. Let's add that.

Change-Id: I8938fef87343d66cb216db364304ec7144ecaca6
2018-02-07 15:57:28 -05:00
Pradeep Kilambi
4308485b2c Restore disable templates for telemetry for Queens
We need these templates accessible for fast forward upgrades
workflow to disable these services. Lets put these back in
and remove them in Rocky instead. These were originally
removed in commit  5ebbc81c2ad90c34925173942bdd4a468964d53b.

Change-Id: Iba1e13c7a78dd012373830331682c9e29d775f73
2018-02-05 14:56:35 +00:00
Emilien Macchi
6a6872f390 Introduce OS::TripleO::Services::Rhsm
Background:
extraconfig/pre_deploy/rhel-registration interface has been maintained
for some time now but it's missing some features and the code overlaps
with ongoing efforts to convert everything to Ansible.

Plan:
Consume ansible-role-redhat-subscription from TripleO, so all the logics
goes into the Ansible role, and not in TripleO anymore.
The single parameter exposed to TripleO is RhsmVars and any Ansible
parameter can be given to make the role working.
The parameter can be overriden per roles, so we can think at specific
cases were some Director roles would have specific RHSM configs.
Once we have feature parity between what is done and what was here
before, we'll deprecate the old interface.

Testing:
Because RHSM can't be tested on CentOS, this code was manually tested on
RHEL against the public subscription portal. Also, we verified that
generated Ansible playbooks were correct and called the role with the
right parameters.

Documentation:
We'll work on documentation during the following weeks and explain
how to switch from the previous interface to the new one, and also
document new uses requested by our users.

Change-Id: I8610e4f1f8478f2dcbe3afc319981df914ce1780
2017-12-27 11:03:49 -08:00
Gabriel Szasz
a59be61478 Add Novacontrol role
The following services (referred to as 'nova control services'):

 * NovaApi
 * NovaConductor
 * NovaConsoleauth
 * NovaMetadata
 * NovaPlacement
 * NovaVncProxy
 * Ec2Api

should run on separate node according to the recent version of the
standalone role topology that is officially supported by Red Hat
OpenStack Platform.  TripleO Heat Templates already do contain a
standalone topology defined by the combination of the following THT
roles:

 * ControllerOpenstack
 * Database
 * Messaging
 * Networker

The proposed 'Novacontrol' role extends this topology by another subset
of controller services running on standalone node.  Since the
'ControllerOpenstack' role is already being actively used for testing
the standalone Database-Messaging-Networker topology, this patch also
introduces the 'ControllerAllNovaStandalone' role to define
complementary controller node for the extended standalone topology:

 * ControllerAllNovaStandalone
 * Database
 * Messaging
 * Networker
 * Novacontrol

The patch also introduces the 'ControllerNovaStandalone' role for the
complementary controller node to the minimal nova standalone topology:

 * ControllerNovaStandalone
 * Novacontrol

Change-Id: Ib973765343dc1bf97b95c8aea3234916fa7a519a
2017-12-12 15:50:14 +01:00