diff --git a/meta/main.yml b/meta/main.yml index 501895a..5c72ae6 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -22,16 +22,14 @@ galaxy_info: platforms: - name: Debian versions: - - stretch + - buster - name: Ubuntu versions: - bionic + - focal - name: EL versions: - - 7 - - name: opensuse - versions: - - 15 + - 8 categories: - cloud - python diff --git a/tasks/placement_install.yml b/tasks/placement_install.yml index 29ad2fa..18c8b52 100644 --- a/tasks/placement_install.yml +++ b/tasks/placement_install.yml @@ -29,7 +29,7 @@ package: name: "{{ placement_package_list }}" state: "{{ placement_package_state }}" - update_cache: "{{ (ansible_facts['pkg_mgr'] in ['apt', 'zypper']) | ternary('yes', omit) }}" + update_cache: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}" cache_valid_time: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary(cache_timeout, omit) }}" register: install_packages until: install_packages is success diff --git a/vars/redhat.yml b/vars/redhat.yml index f50f454..31e9a55 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -21,4 +21,4 @@ placement_devel_distro_packages: placement_service_distro_packages: - openstack-placement-api - - "{{ ansible_facts['distribution_major_version'] is version('8', '<') | ternary('systemd-python', 'python3-systemd') }}" + - python3-systemd diff --git a/vars/suse.yml b/vars/suse.yml deleted file mode 100644 index 31e9a55..0000000 --- a/vars/suse.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -# Copyright 2019, VEXXHOST, Inc. -# -# 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. - -placement_distro_packages: - - libxml2 - -placement_devel_distro_packages: - - systemd-devel - -placement_service_distro_packages: - - openstack-placement-api - - python3-systemd