X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=lib%2Fparse-functions.sh;h=9c2ebff57ad0744ad3fa88ab73cdbcbd0be696cb;hb=a151bf4b58bb83753f5d4de7f34a6f77c61d87ed;hp=e8dd982d33be703b4c0d98d10b6d6fefab314fff;hpb=8b09ebc6ff40a8d03d2eef292a3c710619ee94f2;p=apex.git

diff --git a/lib/parse-functions.sh b/lib/parse-functions.sh
index e8dd982d..9c2ebff5 100755
--- a/lib/parse-functions.sh
+++ b/lib/parse-functions.sh
@@ -55,21 +55,34 @@ parse_network_settings() {
   local output parse_ext
   parse_ext=''
 
-  for val in ${performance_roles[@]}; do
-    if [ "$val" == "Compute" ]; then
-      parse_ext="${parse_ext} --compute-pre-config "
-    elif [ "$val" == "Controller" ]; then
-      parse_ext="${parse_ext} --controller-pre-config "
-    fi
-  done
+  if [[ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' || "${deploy_options_array['dataplane']}" == 'fdio' ]]; then
+      for val in ${performance_roles[@]}; do
+        if [ "$val" == "Compute" ]; then
+          parse_ext="${parse_ext} --compute-pre-config "
+        elif [ "$val" == "Controller" ]; then
+          parse_ext="${parse_ext} --controller-pre-config "
+        fi
+      done
+  fi
 
-  if output=$(python3.4 -B $LIB/python/apex_python_utils.py parse-net-settings -s $NETSETS -i $net_isolation_enabled -e $CONFIG/network-environment.yaml $parse_ext); then
+  if output=$(python3.4 -B $LIB/python/apex_python_utils.py parse-net-settings -s $NETSETS $net_isolation_arg -e $CONFIG/network-environment.yaml $parse_ext); then
       echo -e "${blue}${output}${reset}"
       eval "$output"
   else
       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 +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