From 37a91abe7e867c91a7c4365c418ecf3d9faf04dc Mon Sep 17 00:00:00 2001
From: Matthieu Saulnier <fantom@fedoraproject.org>
Date: Fri, 15 Aug 2014 23:58:35 +0200
Subject: Add var condition in case of the use of Fedora Rawhide Fix condition
 for stable release 20 or later Rename update.yml as repos.yml in common role
 Remove update system during common role

---
 roles/common/tasks/main.yml   |  6 +++---
 roles/common/tasks/repos.yml  | 17 +++++++++++++++++
 roles/common/tasks/update.yml | 17 -----------------
 roles/common/tasks/yum.yml    |  3 ++-
 4 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 roles/common/tasks/repos.yml
 delete mode 100644 roles/common/tasks/update.yml

(limited to 'roles/common')

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/repos.yml b/roles/common/tasks/repos.yml
new file mode 100644
index 0000000..ee56584
--- /dev/null
+++ b/roles/common/tasks/repos.yml
@@ -0,0 +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"
+        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"
+        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"
+        and ansible_distribution_release != "Rawhide"
diff --git a/roles/common/tasks/update.yml b/roles/common/tasks/update.yml
deleted file mode 100644
index 9a7548f..0000000
--- a/roles/common/tasks/update.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-- 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"
-
-- 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"
-
-- 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
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
-- 
cgit