From b08e3323c00bf216730ed44c729562ffa1f57ac9 Mon Sep 17 00:00:00 2001
From: Dan Radez <dradez@redhat.com>
Date: Wed, 13 Jan 2016 11:43:52 -0500
Subject: quick fixes to deploy and clean

- adding a missing exit 1 in the deploy script
- setting link up on hypervisor bridges
- redirecting error from cleanup commands so they're not so chatty

Change-Id: I844c35effb2817948ea096b07a34d83678803e00
---
 ci/deploy.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ci/deploy.sh')

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 0ee7ac0d..05df6406 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -859,6 +859,7 @@ EOI
       ovs_ip=${ip_range##*,}
       eval "net_cidr=\${${network}_cidr}"
       sudo ip addr add ${ovs_ip}/${net_cidr##*/} dev ${NET_MAP[$network]}
+      sudo ip link set up ${NET_MAP[$network]}
       tmp_ip=$(find_ip ${NET_MAP[$network]})
       if [ -n "$tmp_ip" ]; then
         echo -e "${blue}INFO: OVS Bridge ${NET_MAP[$network]} IP set: ${tmp_ip}${reset}"
@@ -960,6 +961,7 @@ parse_cmdline() {
     echo -e "${red}INFO: Single flat network requested. Ignoring any network settings!${reset}"
   elif [[ -z "$NETSETS" && "$net_isolation_enabled" == "TRUE" ]]; then
     echo -e "${red}ERROR: You must provide a network_settings file with -n or use --flat to force a single flat network{reset}"
+    exit 1
   fi
 
   if [[ -n "$virtual" && -n "$INVENTORY_FILE" ]]; then
-- 
cgit 1.2.3-korg