don't do yum things when python3

7b7dfae4 · nanahira · bd40b869 · 7b7dfae4 · 7b7dfae4 · 7b7dfae4
Commit 7b7dfae4 authored Apr 03, 2021 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

tasks/docker.yml tasks/docker.yml +1 -1

tasks/main.yml tasks/main.yml +1 -1

tasks/upgrade.yml tasks/upgrade.yml +1 -1

No files found.
--- a/tasks/docker.yml
+++ b/tasks/docker.yml
@@ -66,7 +66,7 @@
  yum:
    name: docker-ce,docker-ce-cli,containerd.io
    update_cache: yes
-  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version|int == 7
+  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version|int == 7 and ansible_python.version.major == 2
  notify: restart_docker
 - name: 安装 Docker (dnf)
  become: true

--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -27,7 +27,7 @@
  when: ansible_os_family == 'Debian'
 - name: yum
  include_tasks: yum.yml
-  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version|int == 7
+  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version|int == 7 and ansible_python.version.major == 2
 - name: dnf
  include_tasks: dnf.yml
  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version|int >= 8

--- a/tasks/upgrade.yml
+++ b/tasks/upgrade.yml
@@ -10,7 +10,7 @@
    name: '*'
    update_cache: true
    state: latest
-  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version|int == 7
+  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version|int == 7 and ansible_python.version.major == 2
 - name: dnf update
  become: true
  dnf: