diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-02-18 14:47:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-18 14:47:08 +0000 |
| commit | da0d8e06bb9a55fb9b15b34cabb19c681667d383 (patch) | |
| tree | ff9e2ff0b8f9d62111d33d2b7fec7bd22775b466 /lib/parse-functions.sh | |
| parent | 645949cbac2bb766d18dfd9f818b6c14545a35e2 (diff) | |
| parent | c7e6d15b4d2570c7f9d2bc8dcfc57d8a68fede71 (diff) | |
Merge "Add support for odl-fdio scenario"
Diffstat (limited to 'lib/parse-functions.sh')
| -rwxr-xr-x | lib/parse-functions.sh | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/lib/parse-functions.sh b/lib/parse-functions.sh index 94eac01a..2114c0b7 100755 --- a/lib/parse-functions.sh +++ b/lib/parse-functions.sh @@ -12,20 +12,9 @@ ##parses network settings yaml into globals parse_network_settings() { - local output parse_ext - parse_ext='' - - 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 + local output - if output=$(python3 -B $LIB/python/apex_python_utils.py parse-net-settings -s $NETSETS -td $APEX_TMP_DIR -e $BASE/network-environment.yaml $parse_ext); then + if output=$(python3 -B $LIB/python/apex_python_utils.py parse-net-settings -s $NETSETS -td $APEX_TMP_DIR -e $BASE/network-environment.yaml); then echo -e "${blue}${output}${reset}" eval "$output" else |