From b42db3995550c56710cd62a4ed84cc5112fa02a8 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 13 May 2015 23:39:35 +0000
Subject: [PATCH] See if we can handle the yum, dnf and ostree cases right.

---
 playbooks/transient_cloud_instance.yml | 6 +++++-
 tasks/cloud_setup_basic.yml            | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/playbooks/transient_cloud_instance.yml b/playbooks/transient_cloud_instance.yml
index 57956be93b..7dd4e63081 100644
--- a/playbooks/transient_cloud_instance.yml
+++ b/playbooks/transient_cloud_instance.yml
@@ -49,10 +49,14 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   tasks:
-  - name: install cloud-utils
+  - name: install cloud-utils (yum)
     yum: pkg=cloud-utils state=present
     when: ansible_distribution_major_version < '22'
 
+  - name: install cloud-utils (dnf)
+    command: dnf install -y cloud-utils
+    when: ansible_distribution_major_version > '21' and not ansible_cmdline.ostree
+
   - include: "{{ tasks }}/cloud_setup_basic.yml"
 
   handlers:
diff --git a/tasks/cloud_setup_basic.yml b/tasks/cloud_setup_basic.yml
index 7c7ba4ebff..63c8f1e69e 100644
--- a/tasks/cloud_setup_basic.yml
+++ b/tasks/cloud_setup_basic.yml
@@ -13,7 +13,7 @@
 
 - name: ntp pkgs
   command: dnf install -y ntpdate ntp libsemanage-python libselinux-python
-  when: ansible_distribution_major_version > '22'
+  when: ansible_distribution_major_version > '21' and not ansible_cmdline.ostree
   tags:
   - packages
 
@@ -61,7 +61,7 @@
 - name: update all
   command: dnf -y update creates=/etc/sysconfig/global-update-applied
   register: updated
-  when: ansible_distribution_major_version > '21'
+  when: ansible_distribution_major_version > '21' and not ansible_cmdline.ostree
   tags:
   - packages