3fe1d72fa6
For multi-rhel environments the container/service names are different
based on the RHEL version. Introduce the capacity to define the expected
container/service names for each of the compute nodes in a deployment.
Current compute yaml file follows the below format:
computerhel8-0.redhat.local:
services:
libvirt:
container_name: nova_libvirt
start_command: 'systemctl start tripleo_nova_libvirt'
stop_command: 'systemctl stop tripleo_nova_libvirt'
nova-compute:
container_name: nova_compute
config_path: '/var/lib/config-data/puppet-generated/nova_libvirt/etc/nova/nova.conf'
start_command: 'systemctl start tripleo_nova_compute'
stop_command: 'systemctl stop tripleo_nova_compute'
compute-0.redhat.local:
services:
libvirt:
container_name: nova_virtqemud
start_command: 'systemctl start tripleo_nova_virtqemud'
stop_command: 'systemctl stop tripleo_nova_virtqemud'
nova-compute:
container_name: nova_compute
config_path: '/var/lib/config-data/puppet-generated/nova_libvirt/etc/nova/nova.conf'
start_command: 'systemctl start tripleo_nova_compute'
stop_command: 'systemctl stop tripleo_nova_compute'
Also removed the unit test execution since they do not support this
latest change and do not feel the tests are adding any value to commit
validation at this time.
Change-Id: I98ac827feb4be77af9a482d8ce43d0f1d062e54d
84 lines
2.7 KiB
Python
84 lines
2.7 KiB
Python
# Copyright 2020 Red Hat
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import six
|
|
|
|
from oslo_serialization import jsonutils
|
|
from tempest import config
|
|
from whitebox_tempest_plugin import exceptions
|
|
import yaml
|
|
|
|
if six.PY2:
|
|
import contextlib2 as contextlib
|
|
else:
|
|
import contextlib
|
|
|
|
CONF = config.CONF
|
|
_nodes = None
|
|
|
|
|
|
def normalize_json(json):
|
|
"""Normalizes a JSON dict for consistent equality tests. Sorts the keys,
|
|
and sorts any values that are lists.
|
|
"""
|
|
def sort_list_values(json):
|
|
for k, v in json.items():
|
|
if isinstance(v, list):
|
|
v.sort()
|
|
[sort_list_values(x) for x in v if isinstance(x, dict)]
|
|
elif isinstance(v, dict):
|
|
sort_list_values(v)
|
|
|
|
json = jsonutils.loads(jsonutils.dumps(json, sort_keys=True))
|
|
sort_list_values(json)
|
|
return json
|
|
|
|
|
|
@contextlib.contextmanager
|
|
def multicontext(*context_managers):
|
|
with contextlib.ExitStack() as stack:
|
|
yield [stack.enter_context(mgr) for mgr in context_managers]
|
|
|
|
|
|
def get_ctlplane_address(compute_hostname):
|
|
"""Return the appropriate host address depending on a deployment.
|
|
|
|
In TripleO deployments the Undercloud does not have DNS entries for
|
|
the compute hosts. This method checks if there are 'DNS' mappings of
|
|
the provided hostname to its control plane IP address and returns it.
|
|
For Devstack deployments, no such parameters will exist and the method
|
|
will just return compute_hostname
|
|
|
|
:param compute_hostname: str the compute hostname
|
|
:return: The address to be used to access the compute host. For
|
|
devstack deployments, this is compute_host itself. For TripleO, it needs
|
|
to be looked up in the configuration.
|
|
"""
|
|
if not CONF.whitebox.ctlplane_addresses:
|
|
return compute_hostname
|
|
|
|
if compute_hostname in CONF.whitebox.ctlplane_addresses:
|
|
return CONF.whitebox.ctlplane_addresses[compute_hostname]
|
|
|
|
raise exceptions.CtrlplaneAddressResolutionError(host=compute_hostname)
|
|
|
|
|
|
def get_host_details(host):
|
|
global _nodes
|
|
if _nodes is None:
|
|
nodes_location = CONF.whitebox.nodes_yaml
|
|
with open(nodes_location, "r") as f:
|
|
_nodes = yaml.safe_load(f)
|
|
return _nodes.get(host)
|