From b4781ad203c1905894f53f9ef931ae60dfa1bc70 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 28 Oct 2015 15:17:20 -0400 Subject: Adds HA support to deploy Defaults the deploy to use HA and adds new param for using non-HA. JIRA: APEX-40 Change-Id: Ib3fc8b31ea13a3c590ceaa875197b4b9c1bb55a1 Signed-off-by: Tim Rozet --- build/opnfv-apex.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'build/opnfv-apex.spec') diff --git a/build/opnfv-apex.spec b/build/opnfv-apex.spec index 5173565c..641c37c7 100644 --- a/build/opnfv-apex.spec +++ b/build/opnfv-apex.spec @@ -32,8 +32,7 @@ mkdir -p %{buildroot}%{_var}/opt/opnfv/stack/ 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/baremetalbrbm_*.xml %{buildroot}%{_var}/opt/opnfv/ cp build/brbm-net.xml %{buildroot}%{_var}/opt/opnfv/ cp build/default-pool.xml %{buildroot}%{_var}/opt/opnfv/ @@ -52,8 +51,7 @@ cp build/stack/overcloud-full.vmlinuz %{buildroot}%{_var}/opt/opnfv/stack/ %{_bindir}/opnfv-clean %{_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/baremetalbrbm_*.xml %{_var}/opt/opnfv/brbm-net.xml %{_var}/opt/opnfv/default-pool.xml %{_var}/opt/opnfv/instackenv-virt.json -- cgit 1.2.3-korg