From: Feng Pan <fpan@redhat.com>
Date: Mon, 15 Aug 2016 15:26:09 +0000 (-0400)
Subject: Check data plane settings before adding ovs_dpdk/fdio config
X-Git-Tag: colorado.1.0~77^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=47b9101e7244b894654ae0916d8f3f0ce913b53e;p=apex.git

Check data plane settings before adding ovs_dpdk/fdio config

JIRA: APEX-227

Change-Id: I5f55f862e564205b2e426e60d741e60bc255f2f4
Signed-off-by: Feng Pan <fpan@redhat.com>
---

diff --git a/lib/parse-functions.sh b/lib/parse-functions.sh
index 0be62e25..a582c28a 100755
--- a/lib/parse-functions.sh
+++ b/lib/parse-functions.sh
@@ -55,13 +55,15 @@ 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 $net_isolation_arg -e $CONFIG/network-environment.yaml $parse_ext); then
       echo -e "${blue}${output}${reset}"