From a257bbece0c366a8c4dda0d2c161f16b959fe1ba Mon Sep 17 00:00:00 2001
From: Seth Vidal <skvidal@fedoraproject.org>
Date: Tue, 23 Apr 2013 00:21:32 +0000
Subject: [PATCH] renae temp f17 to fedora add a conditional for the
 infrastructure repo

---
 .../{f17-temp-instance.yml => fedora-temp-instance.yml}  | 9 ++++++---
 tasks/growroot_cloud.yml                                 | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)
 rename playbooks/{f17-temp-instance.yml => fedora-temp-instance.yml} (73%)

diff --git a/playbooks/f17-temp-instance.yml b/playbooks/fedora-temp-instance.yml
similarity index 73%
rename from playbooks/f17-temp-instance.yml
rename to playbooks/fedora-temp-instance.yml
index 6a1ee3a30e..b218ade2c5 100644
--- a/playbooks/f17-temp-instance.yml
+++ b/playbooks/fedora-temp-instance.yml
@@ -1,3 +1,6 @@
+# setup a transient fedora instance
+# optionally can take --extra-vars="hostbase=hostnamebase root_auth_users='user1 user2 user3'"
+
 - name: check/create instance
   hosts: lockbox01.phx2.fedoraproject.org
   user: root
@@ -8,8 +11,8 @@
    - ${private}/vars.yml
   vars:
   - keypair: admin
-  - image: emi-B5BA397D
-  - instance_type: c1.medium
+  - image: $f18_qcow_id: 
+  - instance_type: m1.small
   - security_group: default
 
   tasks:
@@ -26,8 +29,8 @@
    - ${vars}/${ansible_distribution}.yml
 
   tasks:
+  - include: $tasks/growroot_cloud.yml
   - include: $tasks/cloud_setup_basic.yml
 
-
   handlers:
   - include: $handlers/restart_services.yml
diff --git a/tasks/growroot_cloud.yml b/tasks/growroot_cloud.yml
index 4023f4c8bd..637f91efa6 100644
--- a/tasks/growroot_cloud.yml
+++ b/tasks/growroot_cloud.yml
@@ -1,6 +1,7 @@
 - name: add infra repo 
   action: get_url url=http://infrastructure.fedoraproject.org/el/infrastructure.repo dest=/etc/yum.repos.d/
-  
+  only_if: '$is_rhel'
+
 - name: install cloud-utils
   action: yum name=cloud-utils state=present