Add centos-8 and ubuntu focal support

we need separate redhat-8.yml file to handle libvirt libraries condition.
Also as we've fully migrated to py3, no need to install py2 libraries.

Change-Id: I2db9cdfa2500c9a4858fd4b43e636d728c8dec6d
This commit is contained in:
root
2020-07-21 09:32:01 -04:00
committed by Dmitriy Rabotyagov (noonedeadpunk)
parent e6beb1c166
commit 9ae178f312
4 changed files with 55 additions and 11 deletions

View File

@@ -19,7 +19,6 @@ cache_timeout: 600
# Common apt packages
ceilometer_distro_packages:
- git
- python-libvirt
- python3-libvirt
ceilometer_devel_distro_packages:
@@ -30,8 +29,7 @@ ceilometer_devel_distro_packages:
ceilometer_service_distro_packages:
- python3-ceilometer
- "{{ (ceilometer_gnocchi_enabled | bool) | ternary('python3-gnocchiclient', '') }}"
- python-systemd
- python3-gnocchiclient
- python3-systemd
ceilometer_oslomsg_amqp1_distro_packages:
@@ -39,5 +37,4 @@ ceilometer_oslomsg_amqp1_distro_packages:
- sasl2-bin
ceilometer_packages_to_symlink:
- python-libvirt
- python3-libvirt

View File

@@ -15,11 +15,11 @@
ceilometer_distro_packages:
- git
- "{{ (ansible_distribution_major_version|int <= 7) | ternary('libvirt-devel', 'python3-libvirt') }}"
ceilometer_devel_distro_packages:
- systemd-devel
- which
- libvirt-devel
- libxml2-devel
- libxslt-devel
@@ -36,12 +36,7 @@ ceilometer_oslomsg_amqp1_distro_packages:
- cyrus-sasl-plain
- cyrus-sasl-md5
ceilometer_packages_to_symlink: |-
{% set packages = [] %}
{% if ansible_distribution_major_version|int > 7 %}
{% set _ = packages.extend(['python3-libvirt']) %}
{% endif %}
{{ packages }}
ceilometer_packages_to_symlink: []
ceilometer_extra_pip_packages:
- libvirt-python

40
vars/redhat-8.yml Normal file
View File

@@ -0,0 +1,40 @@
---
# Copyright 2014, Rackspace US, 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.
ceilometer_distro_packages:
- git
- python3-libvirt
ceilometer_devel_distro_packages:
- systemd-devel
- which
- libxml2-devel
- libxslt-devel
ceilometer_service_distro_packages:
- openstack-ceilometer-central
- openstack-ceilometer-compute
- openstack-ceilometer-ipmi
- openstack-ceilometer-notification
- openstack-ceilometer-polling
- python3-systemd
ceilometer_oslomsg_amqp1_distro_packages:
- cyrus-sasl-lib
- cyrus-sasl-plain
- cyrus-sasl-md5
ceilometer_packages_to_symlink:
- python3-libvirt

View File

@@ -21,3 +21,15 @@
- openstack-ansible-deploy-aio_distro_metal-jobs
- publish-openstack-docs-pti
- release-notes-jobs-python3
check:
jobs:
- openstack-ansible-deploy-aio_metal-centos-8:
voting: false
- openstack-ansible-deploy-aio_distro_metal-centos-8:
voting: false
gate:
jobs:
- openstack-ansible-deploy-aio_metal-centos-8:
voting: false
- openstack-ansible-deploy-aio_distro_metal-centos-8:
voting: false