summaryrefslogtreecommitdiffstats
path: root/build/Makefile
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2015-10-28 15:17:20 -0400
committerTim Rozet <trozet@redhat.com>2015-11-02 16:18:29 -0500
commitb4781ad203c1905894f53f9ef931ae60dfa1bc70 (patch)
tree20013316d0aebca2aaa51e0d01eae3d1bf87e834 /build/Makefile
parent7dfb433c9dd10ef759e46fc655e0958b3baf2e82 (diff)
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 <trozet@redhat.com>
Diffstat (limited to 'build/Makefile')
-rw-r--r--build/Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/build/Makefile b/build/Makefile
index 2c7e3e2..fa89ee8 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -101,12 +101,11 @@ rpm:
pushd ../ && git archive --format=tar --prefix=opnfv-apex-$(RPMVERS)/ HEAD > build/opnfv-apex.tar
tar -u --xform="s:instack.qcow2:opnfv-apex-$(RPMVERS)/build/instack.qcow2:" --file=opnfv-apex.tar instack.qcow2
tar -u --xform="s:instack.xml:opnfv-apex-$(RPMVERS)/build/instack.xml:" --file=opnfv-apex.tar instack.xml
- qemu-img create -f qcow2 baremetalbrbm_0.qcow2 40G
- tar -u --xform="s:baremetalbrbm_0.qcow2:opnfv-apex-$(RPMVERS)/build/baremetalbrbm_0.qcow2:" --file=opnfv-apex.tar baremetalbrbm_0.qcow2
tar -u --xform="s:baremetalbrbm_0.xml:opnfv-apex-$(RPMVERS)/build/baremetalbrbm_0.xml:" --file=opnfv-apex.tar baremetalbrbm_0.xml
- qemu-img create -f qcow2 baremetalbrbm_1.qcow2 40G
- tar -u --xform="s:baremetalbrbm_1.qcow2:opnfv-apex-$(RPMVERS)/build/baremetalbrbm_1.qcow2:" --file=opnfv-apex.tar baremetalbrbm_1.qcow2
tar -u --xform="s:baremetalbrbm_1.xml:opnfv-apex-$(RPMVERS)/build/baremetalbrbm_1.xml:" --file=opnfv-apex.tar baremetalbrbm_1.xml
+ tar -u --xform="s:baremetalbrbm_2.xml:opnfv-apex-$(RPMVERS)/build/baremetalbrbm_2.xml:" --file=opnfv-apex.tar baremetalbrbm_2.xml
+ tar -u --xform="s:baremetalbrbm_3.xml:opnfv-apex-$(RPMVERS)/build/baremetalbrbm_3.xml:" --file=opnfv-apex.tar baremetalbrbm_3.xml
+ tar -u --xform="s:baremetalbrbm_4.xml:opnfv-apex-$(RPMVERS)/build/baremetalbrbm_4.xml:" --file=opnfv-apex.tar baremetalbrbm_4.xml
tar -u --xform="s:brbm-net.xml:opnfv-apex-$(RPMVERS)/build/brbm-net.xml:" --file=opnfv-apex.tar brbm-net.xml
tar -u --xform="s:default-pool.xml:opnfv-apex-$(RPMVERS)/build/default-pool.xml:" --file=opnfv-apex.tar default-pool.xml
tar -u --xform="s:instackenv-virt.json:opnfv-apex-$(RPMVERS)/build/instackenv-virt.json:" --file=opnfv-apex.tar instackenv-virt.json
@@ -132,6 +131,9 @@ instack-clean:
rm -f instackenv-virt.json
rm -f baremetalbrbm_0.xml
rm -f baremetalbrbm_1.xml
+ rm -f baremetalbrbm_2.xml
+ rm -f baremetalbrbm_3.xml
+ rm -f baremetalbrbm_4.xml
rm -f instack.xml
rm -f instack.qcow2