X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fparse-functions.sh;h=9c2ebff57ad0744ad3fa88ab73cdbcbd0be696cb;hb=a151bf4b58bb83753f5d4de7f34a6f77c61d87ed;hp=a582c28a04671bff938ac7dcec4045b39a5ac0f8;hpb=80a38909897493a437a7c2a87f5b0e1e29854a9c;p=apex.git diff --git a/lib/parse-functions.sh b/lib/parse-functions.sh index a582c28a..9c2ebff5 100755 --- a/lib/parse-functions.sh +++ b/lib/parse-functions.sh @@ -72,6 +72,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 @@ -85,16 +96,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