From 8dcd9367c05f7e87918694c50404313c0b976b35 Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Fri, 17 Jun 2016 10:38:50 -0400 Subject: Add ovs-dpdk deploy options check - Make sure flat network is not used when ovs-dpdk is used - Make sure private network is enabled when ovs-dpdk is used JIRA: APEX-174 Change-Id: I595b142124033392145b28221d64088d45c3e8d5 Signed-off-by: Feng Pan --- ci/deploy.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ci/deploy.sh b/ci/deploy.sh index 05e2fa2b..5bf7c92e 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -143,6 +143,17 @@ parse_deploy_settings() { echo -e "${red}ERROR: Failed to parse deploy settings file $DEPLOY_SETTINGS_FILE ${reset}" exit 1 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 =~ "private_network" ]]; then + echo -e "${red}ERROR: tenant network is not enabled for ovs-dpdk ${reset}" + exit 1 + fi + fi } ##parses baremetal yaml settings into compatible json -- cgit 1.2.3-korg