Merge "Remove duplicated get_osp_version method"

This commit is contained in:
Zuul 2021-02-09 12:45:51 +00:00 committed by Gerrit Code Review
commit 8a6752d621
2 changed files with 3 additions and 10 deletions

View File

@ -10,24 +10,16 @@ from tobiko.openstack import neutron
from tobiko.openstack import topology from tobiko.openstack import topology
from tobiko.shell import sh from tobiko.shell import sh
from tobiko.tripleo import containers from tobiko.tripleo import containers
from tobiko.tripleo import has_undercloud
from tobiko.tripleo import pacemaker from tobiko.tripleo import pacemaker
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
def get_osp_version(): def get_osp_version():
if not has_undercloud():
return None
from tobiko.tripleo import undercloud_ssh_client
try: try:
result = sh.execute("awk '{print $6}' /etc/rhosp-release", return topology.get_openstack_version()
ssh_client=undercloud_ssh_client()) except Exception:
except (sh.ShellCommandFailed, sh.ShellTimeoutExpired):
LOG.debug("File /etc/rhosp-release not found")
return None return None
else:
return result.stdout.splitlines()[0]
def is_ovn_configured(): def is_ovn_configured():

View File

@ -27,6 +27,7 @@ get_agent_container_name = _topology.get_agent_container_name
get_log_file_digger = _topology.get_log_file_digger get_log_file_digger = _topology.get_log_file_digger
get_openstack_topology = _topology.get_openstack_topology get_openstack_topology = _topology.get_openstack_topology
get_openstack_node = _topology.get_openstack_node get_openstack_node = _topology.get_openstack_node
get_openstack_version = _topology.get_openstack_version
skip_unless_osp_version = _topology.skip_unless_osp_version skip_unless_osp_version = _topology.skip_unless_osp_version
check_systemd_monitors_agent = _topology.check_systemd_monitors_agent check_systemd_monitors_agent = _topology.check_systemd_monitors_agent
find_openstack_node = _topology.find_openstack_node find_openstack_node = _topology.find_openstack_node