openstack/ansible-collection-kolla
Code Issues Proposed changes

Drop OpenEuler support

Browse Source 
Following Id5e10872de413e7b476c5343360d73c109b9667a

Co-Authored-By: Maksim Malchuk <maksim.malchuk@gmail.com>

Change-Id: Iafc2d1af1a4a8bc49ef4d8e592786587de6daad9
This commit is contained in:
Michal Nasiadka 2024-09-25 16:28:10 +02:00
parent 1fd93d145a
commit f82ce2b98c
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
releasenotes/notes/drop-openeuler-55b80a861905225b.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Support for OpenEuler host operating system has been dropped, due to no
recent (3.10+) python availability that is required by ansible-core 2.16
and later.

6
roles/docker/defaults/main.yml
View File

@ -3,7 +3,7 @@
apt_cache_valid_time: 3600 apt_cache_valid_time: 3600
# Whether to enable a package repository for Docker. # Whether to enable a package repository for Docker.
enable_docker_repo: "{% if ansible_facts.distribution == 'openEuler' %}false{% else %}true{% endif %}" enable_docker_repo: true
# Docker APT repository configuration. # Docker APT repository configuration.
docker_apt_url: "https://download.docker.com/linux/{{ ansible_facts.distribution | lower }}" docker_apt_url: "https://download.docker.com/linux/{{ ansible_facts.distribution | lower }}"
@ -16,7 +16,7 @@ docker_yum_url: "https://download.docker.com/linux/centos"
docker_yum_baseurl: "{{ docker_yum_url }}/$releasever/$basearch/stable" docker_yum_baseurl: "{{ docker_yum_url }}/$releasever/$basearch/stable"
docker_yum_gpgkey: "{{ docker_yum_url }}/gpg" docker_yum_gpgkey: "{{ docker_yum_url }}/gpg"
docker_yum_gpgcheck: true docker_yum_gpgcheck: true
docker_yum_package: "{% if ansible_facts.distribution == 'openEuler' %}docker{{ '-' + docker_yum_package_pin if (docker_yum_package_pin | length > 0) else '' }}{% else %}docker-ce{{ '-' + docker_yum_package_pin if (docker_yum_package_pin | length > 0) else '' }}{% endif %}" docker_yum_package: "docker-ce{{ '-' + docker_yum_package_pin if (docker_yum_package_pin | length > 0) else '' }}"
docker_yum_package_pin: "" docker_yum_package_pin: ""
# List of packages to install. # List of packages to install.
@ -26,7 +26,7 @@ docker_packages:
- "{% if not docker_disable_default_iptables_rules | bool %}iptables{% endif %}" - "{% if not docker_disable_default_iptables_rules | bool %}iptables{% endif %}"
docker_storage_driver: "" docker_storage_driver: ""
docker_custom_config: "{% if ansible_facts.distribution == 'openEuler' %}{\"exec-opts\": [\"native.umask=normal\"]}{% else %}{}{% endif %}" docker_custom_config: {}
docker_http_proxy: "" docker_http_proxy: ""
docker_https_proxy: "" docker_https_proxy: ""

4
roles/packages/defaults/main.yml
View File

@ -13,10 +13,6 @@ ubuntu_pkg_install:
- "{% if enable_multipathd | bool %}sg3-utils-udev{% endif %}" - "{% if enable_multipathd | bool %}sg3-utils-udev{% endif %}"
- tzdata - tzdata
openeuler_pkg_install:
- python3-docker
- python3-dbus
redhat_pkg_install: redhat_pkg_install:
- git - git
- iputils - iputils

1
roles/packages/tasks/main.yml
View File

@ -3,7 +3,6 @@
vars: vars:
pkg_installs: >- pkg_installs: >-
{{ ubuntu_pkg_install if ansible_facts.os_family == 'Debian' {{ ubuntu_pkg_install if ansible_facts.os_family == 'Debian'
else openeuler_pkg_install if ansible_facts.distribution == 'openEuler'
else redhat_pkg_install }} else redhat_pkg_install }}
package: package:
name: "{{ pkg_installs | select | list }}" name: "{{ pkg_installs | select | list }}"