From: Tim Rozet <trozet@redhat.com>
Date: Fri, 4 Dec 2015 16:28:06 +0000 (+0000)
Subject: Merge "adding build deps that have had to be installed manually"
X-Git-Tag: brahmaputra.1.rc0~34
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=51ac87ec20ca9955e7fc63dd722ea2c0dbe49c32;p=apex.git

Merge "adding build deps that have had to be installed manually"
---

51ac87ec20ca9955e7fc63dd722ea2c0dbe49c32
diff --cc ci/deploy.sh
index 5a41e660,a3bdf562..9e6c1e08
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@@ -367,15 -371,10 +367,15 @@@ parse_cmdline() 
                  shift 1
              ;;
          --no-ha )
- 		ha_enabled="FALSE"
- 		echo "HA Deployment Disabled"
+                 ha_enabled="FALSE"
+                 echo "HA Deployment Disabled"
                  shift 1
              ;;
 +        --flat )
 +		net_isolation_enabled="FALSE"
 +		echo "Underlay Network Isolation Disabled: using flat configuration"
 +                shift 1
 +            ;;
          *)
                  display_usage
                  exit 1