summaryrefslogtreecommitdiffstats
path: root/lib/parse-functions.sh
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-08-15 11:26:09 -0400
committerFeng Pan <fpan@redhat.com>2016-08-15 11:26:09 -0400
commit47b9101e7244b894654ae0916d8f3f0ce913b53e (patch)
treecb16a2a6086c82568dea46202009be9ffde7a823 /lib/parse-functions.sh
parent7bc81629e67d747cc362056669070f856494fe01 (diff)
Check data plane settings before adding ovs_dpdk/fdio config
JIRA: APEX-227 Change-Id: I5f55f862e564205b2e426e60d741e60bc255f2f4 Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'lib/parse-functions.sh')
-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 0be62e2..a582c28 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}"