From d4dc4ba1fa5446d5458ff649d0752384a8322af3 Mon Sep 17 00:00:00 2001
From: Dan Radez <dradez@redhat.com>
Date: Thu, 1 Oct 2015 16:46:39 -0400
Subject: Enhancing build with more resources and fixes

cleaning up the VMs after the build and fixing my bad spelling
updating the rpm to include all the files nessesary to launch instack
adding brbm to the build and rpm
fixing stack directory creation
adding glance images to the rpm

Change-Id: Ia553dfa89bbd16a72139be240f47353eac8867f6
Signed-off-by: Dan Radez <dradez@redhat.com>
---
 build/opnfv-apex.spec | 50 ++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 44 insertions(+), 6 deletions(-)

(limited to 'build/opnfv-apex.spec')

diff --git a/build/opnfv-apex.spec b/build/opnfv-apex.spec
index fb010615..845fc627 100644
--- a/build/opnfv-apex.spec
+++ b/build/opnfv-apex.spec
@@ -23,15 +23,53 @@ to deploy an OpenStack overcloud.
 %build
 
 %install
-mkdir -p %{buildroot}/usr/bin/
-cp ci/deploy.sh %{buildroot}/usr/bin/
+mkdir -p %{buildroot}%{_bindir}/
+cp ci/deploy.sh %{buildroot}%{_bindir}/
 
-mkdir -p %{buildroot}/var/lib/libvirt/images/
-cp build/instack.qcow2 %{buildroot}/var/lib/libvirt/images/
+mkdir -p %{buildroot}%{_sharedstatedir}/libvirt/images/
+cp build/instack.qcow2 %{buildroot}%{_sharedstatedir}/libvirt/images/
+cp build/baremetal_0.qcow2 %{buildroot}%{_sharedstatedir}/libvirt/images/
+cp build/baremetal_1.qcow2 %{buildroot}%{_sharedstatedir}/libvirt/images/
+
+mkdir -p %{buildroot}%{_sysconfdir}/libvirt/qemu/
+cp build/instack.xml %{buildroot}%{_sysconfdir}/libvirt/qemu/
+cp build/baremetal_0.xml %{buildroot}%{_sysconfdir}/libvirt/qemu/
+cp build/baremetal_1.xml %{buildroot}%{_sysconfdir}/libvirt/qemu/
+
+mkdir -p %{buildroot}%{_sysconfdir}/libvirt/qemu/networks/
+cp build/brbm.xml %{buildroot}%{_sysconfdir}/libvirt/qemu/networks/
+
+mkdir -p %{buildroot}%{_var}/opt/opnfv/stack/
+cp build/instackenv-virt.json %{buildroot}%{_var}/opt/opnfv/
+cp build/stack/deploy-ramdisk-ironic.initramfs %{buildroot}%{_var}/opt/opnfv/stack/
+cp build/stack/deploy-ramdisk-ironic.kernel %{buildroot}%{_var}/opt/opnfv/stack/
+#cp build/stack/ironic-python-agent.initramfs %{buildroot}/opt/opnfv/stack/
+#cp build/stack/ironic-python-agent.kernel %{buildroot}%{_var}/opt/opnfv/stack/
+#cp build/stack/ironic-python-agent.vmlinuz %{buildroot}%{_var}/opt/opnfv/stack/
+cp build/stack/overcloud-full.initrd %{buildroot}%{_var}/opt/opnfv/stack/
+cp build/stack/overcloud-full.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/
+cp build/stack/overcloud-full.vmlinuz %{buildroot}%{_var}/opt/opnfv/stack/
+cp build/stack/fedora-user.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/
 
 %files
-/usr/bin/deploy.sh
-/var/lib/libvirt/images/instack.qcow2
+%{_bindir}/deploy.sh
+%{_sharedstatedir}/libvirt/images/instack.qcow2
+%{_sharedstatedir}/libvirt/images/baremetal_0.qcow2
+%{_sharedstatedir}/libvirt/images/baremetal_1.qcow2
+%{_sysconfdir}/libvirt/qemu/instack.xml
+%{_sysconfdir}/libvirt/qemu/baremetal_0.xml
+%{_sysconfdir}/libvirt/qemu/baremetal_1.xml
+%{_sysconfdir}/libvirt/qemu/networks/brbm.xml
+%{_var}/opt/opnfv/instackenv-virt.json
+%{_var}/opt/opnfv/stack/deploy-ramdisk-ironic.initramfs
+%{_var}/opt/opnfv/stack/deploy-ramdisk-ironic.kernel
+#{_var}/opt/opnfv/stack/ironic-python-agent.initramfs
+#{_var}/opt/opnfv/stack/ironic-python-agent.kernel
+#{_var}/opt/opnfv/stack/ironic-python-agent.vmlinuz
+%{_var}/opt/opnfv/stack/overcloud-full.initrd
+%{_var}/opt/opnfv/stack/overcloud-full.qcow2
+%{_var}/opt/opnfv/stack/overcloud-full.vmlinuz
+%{_var}/opt/opnfv/stack/fedora-user.qcow2
 
 %changelog
 * Fri Sep 25 2015 Dan Radez <dradez@redhatcom> - 2.0-1
-- 
cgit 1.2.3-korg