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 Depends-On: Ia88b8e606a19ad8ee20665e125df1079b0a771ff Change-Id: I88c4317a711ec9c8e00b13a2f4deede1e53830b1
This commit is contained in:
parent
c6392f9797
commit
c25a19af45
|
@ -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
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
package:
|
||||
name: "{{ aodh_package_list }}"
|
||||
state: "{{ aodh_package_state }}"
|
||||
update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}"
|
||||
update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
|
||||
cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
|
||||
register: install_packages
|
||||
until: install_packages is success
|
||||
|
@ -40,7 +40,7 @@
|
|||
package:
|
||||
name: "{{ aodh_test_distro_packages }}"
|
||||
state: "{{ aodh_package_state }}"
|
||||
update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}"
|
||||
update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
|
||||
cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
|
||||
register: install_packages
|
||||
until: install_packages is success
|
||||
|
|
|
@ -31,7 +31,7 @@ aodh_service_distro_packages:
|
|||
- openstack-aodh-expirer
|
||||
- openstack-aodh-listener
|
||||
- openstack-aodh-notifier
|
||||
- "{{ ansible_distribution_major_version is version('8', '<') | ternary('systemd-python', 'python3-systemd') }}"
|
||||
- python3-systemd
|
||||
|
||||
aodh_test_distro_packages:
|
||||
- git
|
||||
|
|
|
@ -1,52 +0,0 @@
|
|||
---
|
||||
# Copyright 2016, Rackspace US, Inc.
|
||||
# Copyright 2017, SUSE LINUX GmbH.
|
||||
#
|
||||
# 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.
|
||||
|
||||
# Common packages
|
||||
aodh_distro_packages:
|
||||
- rpcbind
|
||||
|
||||
aodh_devel_distro_packages:
|
||||
- libffi-devel
|
||||
- libopenssl-devel
|
||||
- libxml2-devel
|
||||
- libxslt-devel
|
||||
- systemd-devel
|
||||
- pkg-config
|
||||
- which
|
||||
|
||||
aodh_service_distro_packages:
|
||||
- openstack-aodh
|
||||
- openstack-aodh-api
|
||||
- openstack-aodh-evaluator
|
||||
- openstack-aodh-expirer
|
||||
- openstack-aodh-listener
|
||||
- openstack-aodh-notifier
|
||||
- python-systemd
|
||||
|
||||
aodh_test_distro_packages:
|
||||
- git-core
|
||||
|
||||
aodh_oslomsg_amqp1_distro_packages:
|
||||
- cyrus-sasl
|
||||
- cyrus-sasl-plain
|
||||
- cyrus-sasl-digestmd5
|
||||
|
||||
# NOTE(noonedeadpunk): These variables are left for migration from apache to uwsgi
|
||||
# which was introduced during train release. They can be dropped afterwards.
|
||||
aodh_system_service_name: apache2
|
||||
aodh_apache_config:
|
||||
- "/etc/apache2/conf.d/aodh-httpd.conf"
|
||||
aodh_apache_ports: "/etc/apache2/conf.d/ports.conf"
|
Loading…
Reference in New Issue