diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-09-28 17:22:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-28 17:22:42 +0000 |
| commit | 9239d8f96cdd4dfc014de2d211312c3719eceaca (patch) | |
| tree | c61fca329350af8a14fd06d97c04ece040e1b9d4 /lib/parse-functions.sh | |
| parent | 523c9cb5bea77f19c909ebce4fa23c9676c4dd6d (diff) | |
| parent | d8059095ab25e5939373777330b955075d064ec6 (diff) | |
Merge "Removing --flat and network_isolation variables"
Diffstat (limited to 'lib/parse-functions.sh')
| -rwxr-xr-x | lib/parse-functions.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/parse-functions.sh b/lib/parse-functions.sh index 4b3d2346..84da75c5 100755 --- a/lib/parse-functions.sh +++ b/lib/parse-functions.sh @@ -25,7 +25,7 @@ parse_network_settings() { done fi - if output=$(python3 -B $LIB/python/apex_python_utils.py parse-net-settings -s $NETSETS $net_isolation_arg -td $APEX_TMP_DIR -e $CONFIG/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 $CONFIG/network-environment.yaml $parse_ext); then echo -e "${blue}${output}${reset}" eval "$output" else @@ -34,10 +34,6 @@ parse_network_settings() { 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 =~ "tenant" ]]; then echo -e "${red}ERROR: tenant network is not enabled for ovs-dpdk ${reset}" exit 1 |