diff --git a/releasenotes/notes/drop-openeuler-55b80a861905225b.yaml b/releasenotes/notes/drop-openeuler-55b80a861905225b.yaml new file mode 100644 index 0000000..267fc40 --- /dev/null +++ b/releasenotes/notes/drop-openeuler-55b80a861905225b.yaml @@ -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. diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index e146eba..a0185a7 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -3,7 +3,7 @@ apt_cache_valid_time: 3600 # 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_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_gpgkey: "{{ docker_yum_url }}/gpg" 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: "" # List of packages to install. @@ -26,7 +26,7 @@ docker_packages: - "{% if not docker_disable_default_iptables_rules | bool %}iptables{% endif %}" 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_https_proxy: "" diff --git a/roles/packages/defaults/main.yml b/roles/packages/defaults/main.yml index c74ff60..7a3137d 100644 --- a/roles/packages/defaults/main.yml +++ b/roles/packages/defaults/main.yml @@ -13,10 +13,6 @@ ubuntu_pkg_install: - "{% if enable_multipathd | bool %}sg3-utils-udev{% endif %}" - tzdata -openeuler_pkg_install: - - python3-docker - - python3-dbus - redhat_pkg_install: - git - iputils diff --git a/roles/packages/tasks/main.yml b/roles/packages/tasks/main.yml index b877470..20e264f 100644 --- a/roles/packages/tasks/main.yml +++ b/roles/packages/tasks/main.yml @@ -3,7 +3,6 @@ vars: pkg_installs: >- {{ ubuntu_pkg_install if ansible_facts.os_family == 'Debian' - else openeuler_pkg_install if ansible_facts.distribution == 'openEuler' else redhat_pkg_install }} package: name: "{{ pkg_installs | select | list }}"