From 48917e0c6234167366056e99a79586b00bb2596a Mon Sep 17 00:00:00 2001 From: Ganesha H V Date: Thu, 22 Dec 2016 12:28:43 +0530 Subject: [PATCH] Adding tiny images as part of add_basic_images Change-Id: I1795b327e201b80cf5ea67d815f839be3d15d75a Closes-Bug: #1651985 --- fabfile/tasks/helpers.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/fabfile/tasks/helpers.py b/fabfile/tasks/helpers.py index 05c10bb75..af3fcb627 100644 --- a/fabfile/tasks/helpers.py +++ b/fabfile/tasks/helpers.py @@ -468,8 +468,6 @@ def add_images(image=None): ("turnkey-redmine-12.0-squeeze-x86-mysql.vmdk", "redmine-db"), ("ubuntu.img", "ubuntu"), ("traffic/ubuntu-traffic.img", "ubuntu-traffic"), - ("vsrx/junos-vsrx-12.1-in-network.img", "nat-service"), - ("vsrx/junos-vsrx-12.1-transparent.img", "vsrx-bridge"), ("ubuntu-netperf.img", "ubuntu-netperf"), ("analyzer/analyzer-vm-console.qcow2", "analyzer"), ("ddos.qcow2", "ddos"), @@ -595,9 +593,9 @@ def add_basic_images(image=None): ("converts/ubuntu-in-net.vmdk", "ubuntu-in-net", []), ("converts/ubuntu-dhcp-server.vmdk", "ubuntu-dhcp-server", []), ("converts/cirros-0.3.0-x86_64-disk.vmdk", "cirros", [1,10]), - ("vsrx/junos-vsrx-12.1-transparent.img", "vsrx-bridge", []), - ("vsrx/junos-vsrx-12.1-in-network.img", "vsrx", []), - ("analyzer/analyzer-vm-console.qcow2", "analyzer", []), + ("tinycore/tinycore-in-network-nat.qcow2", "tiny_nat_fw", []), + ("tinycore/tinycore-in-network.qcow2", "tiny_in_net", []), + ("tinycore/tinycore-net-transparent-fw.qcow2", "tiny_trans_fw", []), ("converts/ubuntu-dns-server.vmdk", "ubuntu-dns-server", []), ("converts/ubuntu-dhcpdns-server.vmdk", "ubuntu-dhcpdns-server", []), ]