From 07193a0c25e8fa76d7b2f131a65304d6fd3f4ee2 Mon Sep 17 00:00:00 2001
From: Mark Vanderwiel <vanderwl@us.ibm.com>
Date: Thu, 7 Apr 2016 09:29:14 -0500
Subject: [PATCH] Use default cirros image defined in cookbook

Not need to respecify image in env when already
done in cookcook.

Change-Id: Ib674ec5f331109ac26c1d49e45b17f9a650e2616
---
 environments/allinone-centos7.json              | 8 +-------
 environments/allinone-ubuntu14.json             | 8 +-------
 environments/vagrant-multi-centos7-neutron.json | 8 +-------
 environments/vagrant-multi-neutron.json         | 8 +-------
 4 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/environments/allinone-centos7.json b/environments/allinone-centos7.json
index a349114..053a096 100644
--- a/environments/allinone-centos7.json
+++ b/environments/allinone-centos7.json
@@ -22,13 +22,7 @@
         }
       },
       "image": {
-        "image_upload": true,
-        "upload_images": [
-          "cirros"
-          ],
-        "upload_image": {
-          "cirros": "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"
-        }
+        "image_upload": true
       },
       "compute": {
         "conf": {
diff --git a/environments/allinone-ubuntu14.json b/environments/allinone-ubuntu14.json
index abd0416..0126a4a 100644
--- a/environments/allinone-ubuntu14.json
+++ b/environments/allinone-ubuntu14.json
@@ -29,13 +29,7 @@
         }
       },
       "image": {
-        "image_upload": true,
-        "upload_images": [
-          "cirros"
-          ],
-        "upload_image": {
-          "cirros": "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"
-        }
+        "image_upload": true
       },
       "compute": {
         "conf": {
diff --git a/environments/vagrant-multi-centos7-neutron.json b/environments/vagrant-multi-centos7-neutron.json
index 283df8f..9dcb4f3 100644
--- a/environments/vagrant-multi-centos7-neutron.json
+++ b/environments/vagrant-multi-centos7-neutron.json
@@ -40,13 +40,7 @@
                 }
             },
             "image": {
-                "image_upload": true,
-                "upload_images": [
-                    "cirros"
-                ],
-                "upload_image": {
-                    "cirros": "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"
-                }
+                "image_upload": true
             },
             "compute": {
                 "novnc_proxy": {
diff --git a/environments/vagrant-multi-neutron.json b/environments/vagrant-multi-neutron.json
index c0b22c6..a92cb1d 100644
--- a/environments/vagrant-multi-neutron.json
+++ b/environments/vagrant-multi-neutron.json
@@ -77,13 +77,7 @@
                 "registry": {
                     "bind_interface": "eth1"
                 },
-                "image_upload": true,
-                "upload_images": [
-                    "cirros"
-                ],
-                "upload_image": {
-                    "cirros": "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"
-                }
+                "image_upload": true
             },
             "compute": {
                 "enabled_apis": "ec2,osapi_compute",