From 5928e7a63e9bea9a002b5be66535ec45e3b9b1a2 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Thu, 8 Oct 2015 11:00:49 -0400 Subject: Fixes repos and adds errexit checks per radez github commit Also fixes node vms naming issue where naming is changed from baremetal_x to baremetalbrbm_x in liberty. Change-Id: I8b791d71466d7c5c1037e45839e689a9aac0dd8f Signed-off-by: Tim Rozet --- build/opnfv-apex.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'build/opnfv-apex.spec') diff --git a/build/opnfv-apex.spec b/build/opnfv-apex.spec index 845fc627..0bc663be 100644 --- a/build/opnfv-apex.spec +++ b/build/opnfv-apex.spec @@ -28,13 +28,13 @@ cp ci/deploy.sh %{buildroot}%{_bindir}/ 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/ +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/baremetal_0.xml %{buildroot}%{_sysconfdir}/libvirt/qemu/ -cp build/baremetal_1.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}%{_sysconfdir}/libvirt/qemu/networks/ cp build/brbm.xml %{buildroot}%{_sysconfdir}/libvirt/qemu/networks/ @@ -54,11 +54,11 @@ cp build/stack/fedora-user.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/ %files %{_bindir}/deploy.sh %{_sharedstatedir}/libvirt/images/instack.qcow2 -%{_sharedstatedir}/libvirt/images/baremetal_0.qcow2 -%{_sharedstatedir}/libvirt/images/baremetal_1.qcow2 +%{_sharedstatedir}/libvirt/images/baremetalbrbm_0.qcow2 +%{_sharedstatedir}/libvirt/images/baremetalbrbm_1.qcow2 %{_sysconfdir}/libvirt/qemu/instack.xml -%{_sysconfdir}/libvirt/qemu/baremetal_0.xml -%{_sysconfdir}/libvirt/qemu/baremetal_1.xml +%{_sysconfdir}/libvirt/qemu/baremetalbrbm_0.xml +%{_sysconfdir}/libvirt/qemu/baremetalbrbm_1.xml %{_sysconfdir}/libvirt/qemu/networks/brbm.xml %{_var}/opt/opnfv/instackenv-virt.json %{_var}/opt/opnfv/stack/deploy-ramdisk-ironic.initramfs -- cgit 1.2.3-korg