diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-01-08 17:06:02 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-01-09 00:20:38 -0500 |
| commit | 9a11a203fa228cad7a86ebf2cb28ae834d17decd (patch) | |
| tree | 065a1ca971b76cb04bc1159ac52388b1ee168258 /ci | |
| parent | 194784ad1c2878a343377c7ea514ab2d8a95e06c (diff) | |
Fixes attaching instack interfaces to host
This applies only to baremetal deployments. Interfaces from admin and
public networks are attached from the host to the OVS bridges brbm and
brbm2 for external connectivity.
Change-Id: If3f5b33eab267e05ee9094396daa40f37e69319a
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/clean.sh | 11 | ||||
| -rwxr-xr-x | ci/deploy.sh | 9 |
2 files changed, 16 insertions, 4 deletions
diff --git a/ci/clean.sh b/ci/clean.sh index 89e89aa4..45486de0 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -2,7 +2,12 @@ #Clean script to uninstall provisioning server for Apex #author: Dan Radez (dradez@redhat.com) -# +#author: Tim Rozet (trozet@redhat.com) +CONFIG=/var/opt/opnfv + +##LIBRARIES +source $CONFIG/lib/common-functions.sh + vm_index=4 ovs_bridges="brbm brbm1 brbm2 brbm3" # Clean off instack VM @@ -29,7 +34,9 @@ done 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 + if detach_interface_from_ovs ${bridge}; then + ovs-vsctl del-br ${bridge} 2> /dev/null + fi done # clean pub keys from root's auth keys diff --git a/ci/deploy.sh b/ci/deploy.sh index 01bf003d..de3ef513 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -389,8 +389,13 @@ function configure_deps { for network in ${enabled_network_list}; do this_interface=$(eval echo \${${network}_bridged_interface}) # check if this a bridged interface for this network - if [[ -n "$this_interface" || "$this_interface" != "none" ]]; then - ovs-vsctl list-ports ${NET_MAP[$network]} | grep ${this_interface} || ovs-vsctl add-port ${NET_MAP[$network]} ${this_interface} + if [[ ! -z "$this_interface" || "$this_interface" != "none" ]]; then + if ! attach_interface_to_ovs ${NET_MAP[$network]} ${this_interface} ${network}; then + echo -e "${red}ERROR: Unable to bridge interface ${this_interface} to bridge ${NET_MAP[$network]} for enabled network: ${network}${reset}" + exit 1 + else + echo -e "${blue}INFO: Interface ${this_interface} bridged to bridge ${NET_MAP[$network]} for enabled network: ${network}${reset}" + fi else echo "${red}ERROR: Unable to determine interface to bridge to for enabled network: ${network}${reset}" exit 1 |