diff options
author | Tim Rozet <trozet@redhat.com> | 2015-10-28 15:17:20 -0400 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2015-11-02 16:18:29 -0500 |
commit | b4781ad203c1905894f53f9ef931ae60dfa1bc70 (patch) | |
tree | 20013316d0aebca2aaa51e0d01eae3d1bf87e834 /build/instack.sh | |
parent | 7dfb433c9dd10ef759e46fc655e0958b3baf2e82 (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/instack.sh')
-rwxr-xr-x | build/instack.sh | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/build/instack.sh b/build/instack.sh index c19ab0fd..79a99f83 100755 --- a/build/instack.sh +++ b/build/instack.sh @@ -2,6 +2,7 @@ set -e declare -i CNT +vm_index=4 RDO_RELEASE=kilo SSH_OPTIONS=(-o StrictHostKeyChecking=no -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null) @@ -80,11 +81,11 @@ ssh -T ${SSH_OPTIONS[@]} stack@localhost <<EOI set -e virsh destroy instack 2> /dev/null || echo -n '' virsh undefine instack --remove-all-storage 2> /dev/null || echo -n '' -virsh destroy baremetalbrbm_0 2> /dev/null || echo -n '' -virsh undefine baremetalbrbm_0 --remove-all-storage 2> /dev/null || echo -n '' -virsh destroy baremetalbrbm_1 2> /dev/null || echo -n '' -virsh undefine baremetalbrbm_1 --remove-all-storage 2> /dev/null || echo -n '' -NODE_CPU=2 NODE_MEM=8192 instack-virt-setup +for i in \$(seq 0 $vm_index); do + virsh destroy baremetalbrbm_\$i 2> /dev/null || echo -n '' + virsh undefine baremetalbrbm_\$i --remove-all-storage 2> /dev/null || echo -n '' +done +NODE_COUNT=5 NODE_CPU=2 NODE_MEM=8192 instack-virt-setup EOI # let dhcp happen so we can get the ip @@ -150,8 +151,10 @@ if virsh list | grep instack > /dev/null; then fi echo $'\nGenerating libvirt configuration' -virsh dumpxml baremetalbrbm_0 > baremetalbrbm_0.xml -virsh dumpxml baremetalbrbm_1 > baremetalbrbm_1.xml +for i in \$(seq 0 $vm_index); do + virsh dumpxml baremetalbrbm_\$i > baremetalbrbm_\$i.xml +done + virsh dumpxml instack > instack.xml #virsh vol-dumpxml instack.qcow2 --pool default > instack.qcow2.xml virsh net-dumpxml brbm > brbm-net.xml @@ -160,8 +163,10 @@ EOI # copy off the instack artifacts echo "Copying instack files to build directory" -scp ${SSH_OPTIONS[@]} stack@localhost:baremetalbrbm_0.xml . -scp ${SSH_OPTIONS[@]} stack@localhost:baremetalbrbm_1.xml . +for i in $(seq 0 $vm_index); do + scp ${SSH_OPTIONS[@]} stack@localhost:baremetalbrbm_${i}.xml . +done + scp ${SSH_OPTIONS[@]} stack@localhost:instack.xml . scp ${SSH_OPTIONS[@]} stack@localhost:brbm-net.xml . scp ${SSH_OPTIONS[@]} stack@localhost:default-pool.xml . @@ -192,9 +197,9 @@ ssh -T ${SSH_OPTIONS[@]} stack@localhost <<EOI set -e virsh destroy instack 2> /dev/null || echo -n '' virsh undefine instack --remove-all-storage 2> /dev/null || echo -n '' -virsh destroy baremetalbrbm_0 2> /dev/null || echo -n '' -virsh undefine baremetalbrbm_0 --remove-all-storage 2> /dev/null || echo -n '' -virsh destroy baremetalbrbm_1 2> /dev/null || echo -n '' -virsh undefine baremetalbrbm_1 --remove-all-storage 2> /dev/null || echo -n '' +for i in \$(seq 0 $vm_index); do + virsh destroy baremetalbrbm_\$i 2> /dev/null || echo -n '' + virsh undefine baremetalbrbm_\$i --remove-all-storage 2> /dev/null || echo -n '' +done EOI |