moving all resources and configs to /var/opt/opnfv

Change-Id: Id34ae51c351abc6793a4afa484c86b2e2c8e56e8
Signed-off-by: Dan Radez <dradez@redhat.com>

diff --git a/build/opnfv-apex.spec b/build/opnfv-apex.spec
index 9557056..23d4abc 100644 (file)
--- a/build/opnfv-apex.spec
+++ b/build/opnfv-apex.spec
@@ -27,20 +27,14 @@ to deploy an OpenStack overcloud.
 mkdir -p %{buildroot}%{_bindir}/
 cp ci/deploy.sh %{buildroot}%{_bindir}/
 
-mkdir -p %{buildroot}%{_sharedstatedir}/libvirt/images/
-cp build/instack.qcow2 %{buildroot}%{_sharedstatedir}/libvirt/images/
-cp build/baremetalbrbm_0.qcow2 %{buildroot}%{_sharedstatedir}/libvirt/images/
-cp build/baremetalbrbm_1.qcow2 %{buildroot}%{_sharedstatedir}/libvirt/images/
-
-mkdir -p %{buildroot}%{_sysconfdir}/libvirt/qemu/
-cp build/instack.xml %{buildroot}%{_sysconfdir}/libvirt/qemu/
-cp build/baremetalbrbm_0.xml %{buildroot}%{_sysconfdir}/libvirt/qemu/
-cp build/baremetalbrbm_1.xml %{buildroot}%{_sysconfdir}/libvirt/qemu/
+mkdir -p %{buildroot}%{_var}/opt/opnfv/stack/
 
-mkdir -p %{buildroot}%{_sysconfdir}/libvirt/qemu/networks/
-cp build/brbm.xml %{buildroot}%{_sysconfdir}/libvirt/qemu/networks/
+cp build/instack.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/
+cp build/instack.xml %{buildroot}%{_var}/opt/opnfv/
+cp build/baremetalbrbm_0.xml %{buildroot}%{_var}/opt/opnfv/
+cp build/baremetalbrbm_1.xml %{buildroot}%{_var}/opt/opnfv/
+cp build/brbm.xml %{buildroot}%{_var}/opt/opnfv/
 
-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/
@@ -53,13 +47,11 @@ cp build/stack/overcloud-full.vmlinuz %{buildroot}%{_var}/opt/opnfv/stack/
 
 %files
 %{_bindir}/deploy.sh
-%{_sharedstatedir}/libvirt/images/instack.qcow2
-%{_sharedstatedir}/libvirt/images/baremetalbrbm_0.qcow2
-%{_sharedstatedir}/libvirt/images/baremetalbrbm_1.qcow2
-%{_sysconfdir}/libvirt/qemu/instack.xml
-%{_sysconfdir}/libvirt/qemu/baremetalbrbm_0.xml
-%{_sysconfdir}/libvirt/qemu/baremetalbrbm_1.xml
-%{_sysconfdir}/libvirt/qemu/networks/brbm.xml
+%{_var}/opt/opnfv/stack/instack.qcow2
+%{_var}/opt/opnfv/instack.xml
+%{_var}/opt/opnfv/baremetalbrbm_0.xml
+%{_var}/opt/opnfv/baremetalbrbm_1.xml
+%{_var}/opt/opnfv/brbm.xml
 %{_var}/opt/opnfv/instackenv-virt.json
 %{_var}/opt/opnfv/stack/deploy-ramdisk-ironic.initramfs
 %{_var}/opt/opnfv/stack/deploy-ramdisk-ironic.kernel