From 54ab78ac4a87ae2f9261ed7a32134cd74a1a620b Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Fri, 26 Jun 2015 18:49:19 +0000
Subject: [PATCH] Fix up base role so it works on f22 machines with dnf module.

---
 roles/base/tasks/main.yml | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 45cff54e22..a490509f67 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -19,13 +19,23 @@
   - resolvconf
   - base
 
-- name: global default packages to install
+- name: global default packages to install (yum)
   yum: state=present name={{ item }}
   with_items:
    - "{{ global_pkgs_inst }}"
   tags:
   - packages
   - base
+  when: ansible_distribution_major_version|int < 22
+
+- name: global default packages to install (dnf)
+  dnf: state=present name={{ item }}
+  with_items:
+   - "{{ global_pkgs_inst }}"
+  tags:
+  - packages
+  - base
+  when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
 
 - debug: msg="{{ansible_nodename}}  {{inventory_hostname}} {{ansible_distribution_major_version|int}}"
 
@@ -72,21 +82,41 @@
   - config
   - base
 
-- name: dist pkgs to remove
+- name: dist pkgs to remove (yum)
   yum: state=absent name={{ item }}
   with_items:
    - "{{ base_pkgs_erase }}"
   tags:
   - packages
   - base
+  when: ansible_distribution_major_version|int < 22
 
-- name: dist pkgs to install
+- name: dist pkgs to install (yum)
   yum: state=present name={{ item }}
   with_items:
    - "{{ base_pkgs_inst }}"
   tags:
   - packages
   - base
+  when: ansible_distribution_major_version|int < 22
+
+- name: dist pkgs to remove (dnf)
+  dnf: state=absent name={{ item }}
+  with_items:
+   - "{{ base_pkgs_erase }}"
+  tags:
+  - packages
+  - base
+  when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
+
+- name: dist pkgs to install (dnf)
+  dnf: state=present name={{ item }}
+  with_items:
+   - "{{ base_pkgs_inst }}"
+  tags:
+  - packages
+  - base
+  when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
 
 - name: dist disabled services
   service: state=stopped enabled=false name={{ item }}