diff options
author | Tim Rozet <trozet@redhat.com> | 2015-12-17 16:59:05 -0500 |
---|---|---|
committer | Dan Radez <dradez@redhat.com> | 2016-01-06 13:22:07 -0500 |
commit | 37dffdb77dc1424b45fa1fac8a8eebda846b107e (patch) | |
tree | 5d37ab2270ebc3e13a0cd5e79fdf72c4ac3caeeb /ci/clean.sh | |
parent | d71330a6abf114050893d52497a5de05c19d70e1 (diff) |
Adds some network parsing for baremetal deployments and other fixes
Changes include:
- Fixes Intel Pod 2 inventory file
- Check for DHCP server on the host and disable
- Adds realistic+common network-settings file
- Modifies baremetal deployments to bridge to correct interface
- Adds private/storage network OVS bridges
- Parses network-settings into valid network-environment variables
- If certain network-settings are missing they will be auto-detected
Note: The actual settings set forth for deployment only include
admin/external networks at the moment. Private/storage networks will be
handled in an upcoming patch.
JIRA: APEX-50
Change-Id: I0a1a86f37c08702a93fe167688c3149ba5573db4
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'ci/clean.sh')
-rwxr-xr-x | ci/clean.sh | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/ci/clean.sh b/ci/clean.sh index 2b488804..bc193a34 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -4,7 +4,7 @@ #author: Dan Radez (dradez@redhat.com) # vm_index=4 - +ovs_bridges="brbm brbm1 brbm2 brbm3" # Clean off instack VM virsh destroy instack 2> /dev/null || echo -n '' virsh undefine instack --remove-all-storage 2> /dev/null || echo -n '' @@ -13,20 +13,18 @@ rm -f /var/lib/libvirt/images/instack.qcow2 2> /dev/null # Clean off baremetal VMs in case they exist for i in $(seq 0 $vm_index); do - virsh destroy baremetalbrbm_brbm1_$i 2> /dev/null || echo -n '' - virsh undefine baremetalbrbm_brbm1_$i --remove-all-storage 2> /dev/null || echo -n '' - virsh vol-delete baremetalbrbm_brbm1_${i}.qcow2 --pool default 2> /dev/null - rm -f /var/lib/libvirt/images/baremetalbrbm_brbm1_${i}.qcow2 2> /dev/null + virsh destroy baremetalbrbm_brbm1_brbm2_brbm3_$i 2> /dev/null || echo -n '' + virsh undefine baremetalbrbm_brbm1_brbm2_brbm3_$i --remove-all-storage 2> /dev/null || echo -n '' + virsh vol-delete baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2 --pool default 2> /dev/null + rm -f /var/lib/libvirt/images/baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2 2> /dev/null done -# Clean off brbm bridges -virsh net-destroy brbm 2> /dev/null -virsh net-undefine brbm 2> /dev/null -vs-vsctl del-br brbm 2> /dev/null - -virsh net-destroy brbm1 2> /dev/null -virsh net-undefine brbm1 2> /dev/null -vs-vsctl del-br brbm1 2> /dev/null +# Clean off created bridges +for bridge in ${ovs_bridges}; do + virsh net-destroy ${bridge} 2> /dev/null + virsh net-undefine ${bridge} 2> /dev/null + ovs-vsctl del-br ${bridge} 2> /dev/null +done # clean pub keys from root's auth keys sed -i '/stack@instack.localdomain/d' /root/.ssh/authorized_keys |