Remove references to unsupported operating systems

All references to Gentoo, SUSE, Debian stretch and Centos-7  are removed.
Conditional tasks, ternary operators and variables are simplified where possible
OS specific variables files are generalised where possible

Change-Id: Ia712d170740c748002aa44d921ade8750997f8f0
This commit is contained in:
Jonathan Rosser 2021-03-10 12:16:39 +00:00 committed by Dmitriy Rabotyagov
parent 088e4fba80
commit 9b4ac49fa9
4 changed files with 6 additions and 47 deletions

View File

@ -82,7 +82,6 @@ masakari_memcached_servers: "{{ memcached_servers }}"
masakari_monitor_pip_packages:
- "git+{{ masakari_monitors_git_repo }}@{{ masakari_monitors_git_install_branch }}#egg=masakari-monitors"
- systemd-python
- "{{ (ansible_os_family | lower == 'redhat' and ansible_distribution_major_version|int <= 7) | ternary('libvirt-python', '') }}"
## Tunable overrides
masakari_api_paste_ini_overrides: {}

View File

@ -22,17 +22,14 @@ galaxy_info:
platforms:
- name: Debian
versions:
- stretch
- buster
- name: Ubuntu
versions:
- xenial
- bionic
- focal
- name: EL
versions:
- 7
- name: opensuse
versions:
- 15
- 8
categories:
- cloud
- python

View File

@ -24,12 +24,8 @@ masakari_devel_distro_packages:
- systemd-devel
masakari_monitor_distro_packages:
- "{{ (ansible_distribution_major_version|int <= 7) | ternary('libvirt-devel', 'python3-libvirt') }}"
- python3-libvirt
- systemd-devel
masakari_monitor_packages_to_symlink: |-
{% set packages = [] %}
{% if ansible_distribution_major_version|int > 7 %}
{% set _ = packages.extend(['python3-libvirt']) %}
{% endif %}
{{ packages }}
masakari_monitor_packages_to_symlink:
- python3-libvirt

View File

@ -1,33 +0,0 @@
---
# Copyright (c) 2018 NTT DATA
#
# 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.
masakari_distro_packages:
- cronie
- cronie-anacron
- git-core
- rpcbind
- which
masakari_devel_distro_packages:
- libvirt-devel
- libxml2-devel
- systemd-devel
masakari_monitor_distro_packages:
- "{{ (ansible_distribution_version is version ('42', '>=')) | ternary('libvirt-python', 'python2-libvirt-python') }}"
- systemd-devel
masakari_monitor_packages_to_symlink:
- "{{ (ansible_distribution_version is version ('42', '>=')) | ternary('libvirt-python', 'python2-libvirt-python') }}"