summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-08-16 13:39:46 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-16 13:39:46 +0000
commit80a38909897493a437a7c2a87f5b0e1e29854a9c (patch)
tree54b5dea7153733e7842dacf4a22716945fb5b9d6
parent90df047e112c18d3fbda0603c76ac014cf3d7ddd (diff)
parent47b9101e7244b894654ae0916d8f3f0ce913b53e (diff)
Merge "Check data plane settings before adding ovs_dpdk/fdio config"
-rwxr-xr-xlib/parse-functions.sh16
1 files changed, 9 insertions, 7 deletions
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}"