summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-09-15 14:36:24 -0400
committerDan Radez <dradez@redhat.com>2016-09-27 15:34:58 -0400
commitd8059095ab25e5939373777330b955075d064ec6 (patch)
tree3254a048d2d183e848d772e4bf6f61c96a0a3577 /ci
parentfdcadb59d666e277d91629ed75705b4636a8749c (diff)
Removing --flat and network_isolation variables
VLAN support allows a set of nodes with a single nic to deploy removing the need for --flat. flat was not well maintained or tested. Change-Id: Ieae1c2350c83544ce50048b44300fa0b8e68dd43 Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh17
1 files changed, 1 insertions, 16 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 24c26d9..edc6062 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -25,8 +25,6 @@ green=$(tput setaf 2 || echo "")
interactive="FALSE"
ping_site="8.8.8.8"
ntp_server="pool.ntp.org"
-net_isolation_enabled="TRUE"
-net_isolation_arg=""
post_config="TRUE"
debug="FALSE"
@@ -129,12 +127,6 @@ parse_cmdline() {
echo "Executing a Virtual Deployment"
shift 1
;;
- --flat )
- net_isolation_enabled="FALSE"
- net_isolation_arg="--flat"
- echo "Underlay Network Isolation Disabled: using flat configuration"
- shift 1
- ;;
--no-post-config )
post_config="FALSE"
echo "Post install configuration disabled"
@@ -173,9 +165,7 @@ parse_cmdline() {
done
sleep 2
- if [[ ! -z "$NETSETS" && "$net_isolation_enabled" == "FALSE" ]]; then
- echo -e "${red}INFO: Single flat network requested. Only admin network settings will be used!${reset}"
- elif [[ -z "$NETSETS" ]]; then
+ if [[ -z "$NETSETS" ]]; then
echo -e "${red}ERROR: You must provide a network_settings file with -n.${reset}"
exit 1
fi
@@ -206,11 +196,6 @@ parse_cmdline() {
exit 1
fi
- if [[ "$net_isolation_enabled" == "FALSE" && "$post_config" == "TRUE" ]]; then
- echo -e "${blue}INFO: Post Install Configuration will be skipped. It is not supported with --flat${reset}"
- post_config="FALSE"
- fi
-
}
main() {