summaryrefslogtreecommitdiffstats
path: root/lib/parse-functions.sh
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-08-15 10:28:25 -0400
committerFeng Pan <fpan@redhat.com>2016-08-15 10:34:00 -0400
commitdeee062498548c499c1f57a516fcd9eeca79f6fc (patch)
treec47b3d8d139737fc5d5aca0de1e428988ac87699 /lib/parse-functions.sh
parent7bc81629e67d747cc362056669070f856494fe01 (diff)
Move deploy options check to network settings section
JIRA: APEX-228 Change-Id: I85e6794bf2371116facef60ef4e29c9c9ca79131 Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'lib/parse-functions.sh')
-rwxr-xr-xlib/parse-functions.sh21
1 files changed, 11 insertions, 10 deletions
diff --git a/lib/parse-functions.sh b/lib/parse-functions.sh
index 0be62e2..9695405 100755
--- a/lib/parse-functions.sh
+++ b/lib/parse-functions.sh
@@ -70,6 +70,17 @@ parse_network_settings() {
echo -e "${red}ERROR: Failed to parse network settings file $NETSETS ${reset}"
exit 1
fi
+
+ if [ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' ]; then
+ if [ "$net_isolation_enabled" == "FALSE" ]; then
+ echo -e "${red}ERROR: flat network is not supported with ovs-dpdk ${reset}"
+ exit 1
+ fi
+ if [[ ! $enabled_network_list =~ "private_network" ]]; then
+ echo -e "${red}ERROR: tenant network is not enabled for ovs-dpdk ${reset}"
+ exit 1
+ fi
+ fi
}
##parses deploy settings yaml into globals
@@ -83,16 +94,6 @@ parse_deploy_settings() {
exit 1
fi
- if [ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' ]; then
- if [ "$net_isolation_enabled" == "FALSE" ]; then
- echo -e "${red}ERROR: flat network is not supported with ovs-dpdk ${reset}"
- exit 1
- fi
- if [[ ! $enabled_network_list =~ "private_network" ]]; then
- echo -e "${red}ERROR: tenant network is not enabled for ovs-dpdk ${reset}"
- exit 1
- fi
- fi
}
##parses baremetal yaml settings into compatible json