diff options
| -rw-r--r-- | roles/common/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/common/tasks/repos.yml (renamed from roles/common/tasks/update.yml) | 12 | ||||
| -rw-r--r-- | roles/common/tasks/yum.yml | 3 |
3 files changed, 11 insertions, 10 deletions
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 9a0030c..95a8874 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -24,10 +24,10 @@ - name: Installation linux_logo Fedora include: logo.yml - when: ansible_distribution_version|int == 20 and ansible_architecture == "x86_64" + when: ansible_distribution_version|int >= 20 and ansible_architecture == "x86_64" -- name: Mise à jour et dépôt de mise à jour - include: update.yml +- name: Modification des dépôts de mise à jour + include: repos.yml - name: Installation des logiciels de base include: pkgs.yml diff --git a/roles/common/tasks/update.yml b/roles/common/tasks/repos.yml index 9a7548f..ee56584 100644 --- a/roles/common/tasks/update.yml +++ b/roles/common/tasks/repos.yml @@ -1,17 +1,17 @@ - name: Installation du miroir local updates copy: src=updates-fantom.repo dest=/etc/yum.repos.d/updates-fantom.repo - when: ansible_distribution_version|int == 20 and ansible_architecture == "x86_64" + when: ansible_distribution_version|int >= 20 and ansible_architecture == "x86_64" + and ansible_distribution_release != "Rawhide" - name: Désactivation du dépôt Updates ini_file: dest=/etc/yum.repos.d/fedora-updates.repo section=updates option=enabled value=0 - when: ansible_distribution_version|int == 20 and ansible_architecture == "x86_64" + when: ansible_distribution_version|int >= 20 and ansible_architecture == "x86_64" + and ansible_distribution_release != "Rawhide" - name: Installation du miroir updates-testing copy: src=updates-testing-fantom.repo dest=/etc/yum.repos.d/updates-testing-fantom.repo - when: ansible_distribution_version|int == 20 and ansible_architecture == "x86_64" - -- name: Mise à jour de tous les paquets du système - yum: name=* state=latest + when: ansible_distribution_version|int >= 20 and ansible_architecture == "x86_64" + and ansible_distribution_release != "Rawhide" diff --git a/roles/common/tasks/yum.yml b/roles/common/tasks/yum.yml index bfa2939..0aeff59 100644 --- a/roles/common/tasks/yum.yml +++ b/roles/common/tasks/yum.yml @@ -15,7 +15,8 @@ section=main option=deltarpm value=0 - when: ansible_distribution_version|int == 20 and ansible_architecture == "x86_64" + when: ansible_distribution_version|int >= 20 and ansible_architecture == "x86_64" + and ansible_distribution_release != "Rawhide" - name: Nombre mini de noyaux installés ini_file: dest=/etc/yum.conf |