Merge "Add custom domain file for virtual deploy"

3 files changed, 46 insertions, 0 deletions

diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec
index af0f9332..fc82fca7 100644
--- a/build/opnfv-apex-common.spec
+++ b/build/opnfv-apex-common.spec
@@ -61,6 +61,7 @@ install lib/python/apex/common/constants.py %{buildroot}%{python3_sitelib}/apex/
 install lib/python/apex/common/utils.py %{buildroot}%{python3_sitelib}/apex/common/
 mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/
 install lib/installer/onos/onos_gw_mac_update.sh %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/
+install lib/installer/domain.xml %{buildroot}%{_var}/opt/opnfv/lib/installer/
 
 mkdir -p %{buildroot}%{_docdir}/opnfv/
 install LICENSE.rst %{buildroot}%{_docdir}/opnfv/
@@ -81,6 +82,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %{_var}/opt/opnfv/lib/python/
 %{python3_sitelib}/apex/
 %{_var}/opt/opnfv/lib/installer/onos/onos_gw_mac_update.sh
+%{_var}/opt/opnfv/lib/installer/domain.xml
 %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-ovs-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml
@@ -101,6 +103,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %doc %{_docdir}/opnfv/inventory.yaml.example
 
 %changelog
+* Thu Jun 2 2016 Michael Chapman <michapma@redhat.com> - 3.0-7
+- Add custom libvirt domain.xml.
 * Wed Jun 1 2016 Feng Pan <fpan@redhat.com> - 3.0-6
 - Add performance deployment file
 * Sun May 15 2016 Feng Pan <fpan@redhat.com> - 3.0-5
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 83dc4222..1a84421e 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -575,6 +575,12 @@ EOF
   "ssh-user": "root"
 }
 EOF
+  #Overwrite the tripleo-inclubator domain.xml with our own, keeping a backup.
+  if [ ! -f /usr/share/tripleo/templates/domain.xml.bak ]; then
+    /usr/bin/mv -f /usr/share/tripleo/templates/domain.xml /usr/share/tripleo/templates/domain.xml.bak
+  fi
+
+  /usr/bin/cp -f $LIB/installer/domain.xml /usr/share/tripleo/templates/domain.xml
 }
 
 ##Create virtual nodes in virsh
diff --git a/lib/installer/domain.xml b/lib/installer/domain.xml
new file mode 100644
index 00000000..c710e561
--- /dev/null
+++ b/lib/installer/domain.xml
@@ -0,0 +1,36 @@
+<domain type='%(engine)s'>
+  <name>%(name)s</name>
+  <memory unit='KiB'>%(memory)s</memory>
+  <vcpu>%(cpus)s</vcpu>
+  <cpu mode='host-passthrough'/>
+  <os>
+    <type arch='%(arch)s'>hvm</type>
+    <boot dev='%(bootdev)s'/>
+    <bootmenu enable='no'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <controller type='scsi' model='virtio-scsi' index='0'/>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <source file='%(imagefile)s'/>
+      <target dev='sda' bus='%(diskbus)s'/>
+    </disk>
+    %(network)s
+    %(bm_network)s
+    %(enable_serial_console)s
+    <input type='mouse' bus='ps2'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
+    <video>
+      <model type='cirrus' vram='9216' heads='1'/>
+    </video>
+  </devices>
+</domain>