From d7ecfff48e8abaa2f4e3d2c17f34fb83a934b7a4 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 13 May 2015 21:23:12 +0000
Subject: [PATCH] Move image back to default in the playbook and clean up
 another duplicate.

---
 playbooks/temp_cloud_instance.yml | 1 +
 tasks/transient_cloud_new.yml     | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/playbooks/temp_cloud_instance.yml b/playbooks/temp_cloud_instance.yml
index 3e7f888a77..57e2679048 100644
--- a/playbooks/temp_cloud_instance.yml
+++ b/playbooks/temp_cloud_instance.yml
@@ -14,6 +14,7 @@
   vars:
     image: "{{ centos70_x86_64 }}"
     instance_type: m1.small
+    image: "{{ centos70_x86_64 }}"
 
   tasks:
   - name: fail when name is not provided
diff --git a/tasks/transient_cloud_new.yml b/tasks/transient_cloud_new.yml
index 49783f773c..426a55665c 100644
--- a/tasks/transient_cloud_new.yml
+++ b/tasks/transient_cloud_new.yml
@@ -8,11 +8,9 @@
 - name: spin UP VM using nova_compute
   sudo: False
   local_action:
-      image: "{{ centos70_x86_64 }}"
       instance_type: "{{ instance_type }}"
       security_groups: web-80-anywhere-transient,web-443-anywhere-transient,ssh-anywhere-transient,default
       region: nova
-      image_id: "{{ image|image_name_to_id('admin', ADMIN_PASS, inventory_tenant, os_auth_url) }}"
       nics:
       - net-id: "28db7265-fb78-4937-bfe3-9c8a9b959c30"
       name: "{{ name }}"