From e7e2d84bec0d404057bce203f9c90231360e88ee Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 31 May 2016 22:34:54 +0200
Subject: Rebase: deploy related patch series.

After change "common.py: catch stderr in exec_cmd" [1] and other
unrelated changes were merged upstream,
we need to rebase the complete deploy related series.

While we're at it, re-export Fuel@OPNFV patches in Armband.

[1] https://gerrit.opnfv.org/gerrit/#/c/14561/

Change-Id: Icbc8261c2e24e4b29e8f5f2bc83db6829219129a
---
 .../0025-Fuel-VM-for-the-Enea-Armband-lab.patch    | 106 ---------------------
 1 file changed, 106 deletions(-)
 delete mode 100644 patches/opnfv-fuel/0025-Fuel-VM-for-the-Enea-Armband-lab.patch

(limited to 'patches/opnfv-fuel/0025-Fuel-VM-for-the-Enea-Armband-lab.patch')

diff --git a/patches/opnfv-fuel/0025-Fuel-VM-for-the-Enea-Armband-lab.patch b/patches/opnfv-fuel/0025-Fuel-VM-for-the-Enea-Armband-lab.patch
deleted file mode 100644
index fbcd11d1..00000000
--- a/patches/opnfv-fuel/0025-Fuel-VM-for-the-Enea-Armband-lab.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From: Josep Puigdemont <josep.puigdemont@enea.com>
-Date: Wed, 4 May 2016 14:27:23 +0200
-Subject: [PATCH] Fuel VM for the Enea Armband lab
-
-This is the initial VM description fit for Enea's Armband lab.
-
-Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
----
- .../hardware_environment/vms/enea_lab/fuel.xml     | 88 ++++++++++++++++++++++
- 1 file changed, 88 insertions(+)
- create mode 100644 deploy/templates/hardware_environment/vms/enea_lab/fuel.xml
-
-diff --git a/deploy/templates/hardware_environment/vms/enea_lab/fuel.xml b/deploy/templates/hardware_environment/vms/enea_lab/fuel.xml
-new file mode 100644
-index 0000000..8773ed4
---- /dev/null
-+++ b/deploy/templates/hardware_environment/vms/enea_lab/fuel.xml
-@@ -0,0 +1,88 @@
-+<domain type='kvm' id='1'>
-+  <name>fuel</name>
-+  <memory unit='KiB'>8290304</memory>
-+  <currentMemory unit='KiB'>8290304</currentMemory>
-+  <vcpu placement='static'>8</vcpu>
-+  <resource>
-+    <partition>/machine</partition>
-+  </resource>
-+  <os>
-+    <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type>
-+    <boot dev='cdrom'/>
-+    <boot dev='hd'/>
-+    <bootmenu enable='no'/>
-+  </os>
-+  <features>
-+    <acpi/>
-+    <apic/>
-+    <pae/>
-+  </features>
-+  <cpu mode='host-model'>
-+    <model fallback='allow'/>
-+  </cpu>
-+  <clock offset='utc'>
-+    <timer name='rtc' tickpolicy='catchup'/>
-+    <timer name='pit' tickpolicy='delay'/>
-+    <timer name='hpet' present='no'/>
-+  </clock>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>restart</on_crash>
-+  <pm>
-+    <suspend-to-mem enabled='no'/>
-+    <suspend-to-disk enabled='no'/>
-+  </pm>
-+  <devices>
-+    <emulator>/usr/libexec/qemu-kvm</emulator>
-+    <disk type='file' device='disk'>
-+      <driver name='qemu' type='qcow2'/>
-+      <target dev='vda' bus='virtio'/>
-+    </disk>
-+    <disk type='block' device='cdrom'>
-+      <driver name='qemu' type='raw'/>
-+      <target dev='hdb' bus='ide'/>
-+      <readonly/>
-+    </disk>
-+    <controller type='usb' index='0' model='ich9-ehci1'>
-+    </controller>
-+    <controller type='usb' index='0' model='ich9-uhci1'>
-+      <master startport='0'/>
-+    </controller>
-+    <controller type='usb' index='0' model='ich9-uhci2'>
-+      <master startport='2'/>
-+    </controller>
-+    <controller type='usb' index='0' model='ich9-uhci3'>
-+      <master startport='4'/>
-+    </controller>
-+    <controller type='pci' index='0' model='pci-root'>
-+    </controller>
-+    <controller type='ide' index='0'>
-+    </controller>
-+    <controller type='virtio-serial' index='0'>
-+    </controller>
-+    <interface type='bridge'>
-+      <model type='virtio'/>
-+    </interface>
-+    <interface type='bridge'>
-+      <model type='virtio'/>
-+    </interface>
-+    <serial type='pty'>
-+      <source path='/dev/pts/0'/>
-+      <target port='0'/>
-+    </serial>
-+    <console type='pty' tty='/dev/pts/0'>
-+      <source path='/dev/pts/0'/>
-+      <target type='serial' port='0'/>
-+    </console>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <graphics type='vnc' port='5906' autoport='yes' listen='127.0.0.1'>
-+      <listen type='address' address='127.0.0.1'/>
-+    </graphics>
-+    <video>
-+      <model type='vga' vram='16384' heads='1'/>
-+    </video>
-+    <memballoon model='virtio'>
-+    </memballoon>
-+  </devices>
-+</domain>
-- 
cgit 1.2.3-korg