diff --git a/defaults/main.yml b/defaults/main.yml index d244bac..6851799 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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: {} diff --git a/meta/main.yml b/meta/main.yml index bd49df9..a6bb11c 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -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 diff --git a/vars/redhat.yml b/vars/redhat.yml index efd4958..d4b3a98 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -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 diff --git a/vars/suse.yml b/vars/suse.yml deleted file mode 100644 index 8c7dbcc..0000000 --- a/vars/suse.yml +++ /dev/null @@ -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') }}"