From eb338bdf3972fc14bf90da320d2da7602a837a3d Mon Sep 17 00:00:00 2001 From: gvrangan Date: Sat, 19 May 2018 18:20:38 +0530 Subject: [PATCH] Fix Openstack SFC job Problems: a. The networking-sfc failing to initialize, because it checks for service q-svc(not enabled) b. The service_plugins getting overridden Solutions: a. Use "Master" branch of networking-sfc b. Update service_plugins t include sfc drivers Change-Id: I2ef75ab7eb3a26b8f2c023f390fb6fb13228ed22 Signed-off-by: gvrangan --- jjb/integration/integration-deploy-openstack-run-test.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh index 586378b73..8d510e61e 100644 --- a/jjb/integration/integration-deploy-openstack-run-test.sh +++ b/jjb/integration/integration-deploy-openstack-run-test.sh @@ -272,7 +272,6 @@ EOF if [ "${ODL_ML2_DRIVER_VERSION}" == "v2" ]; then echo "ODL_V2DRIVER=True" >> ${local_conf_file_name} fi - IFS=, for plugin_name in ${ENABLE_OS_PLUGINS}; do if [ "$plugin_name" == "networking-odl" ]; then @@ -283,7 +282,8 @@ EOF ENABLE_PLUGIN_ARGS="${DEVSTACK_LBAAS_PLUGIN_REPO} ${OPENSTACK_BRANCH}" IS_LBAAS_PLUGIN_ENABLED="yes" elif [ "$plugin_name" == "networking-sfc" ]; then - ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} ${OPENSTACK_BRANCH}" + ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} master" + IS_SFC_PLUGIN_ENABLED="yes" else echo "Error: Invalid plugin $plugin_name, unsupported" continue @@ -323,6 +323,9 @@ EOF if [ "${IS_LBAAS_PLUGIN_ENABLED}" == "yes" ]; then SERVICE_PLUGINS+=", lbaasv2" fi + if [ "${IS_SFC_PLUGIN_ENABLED}" == "yes" ]; then + SERVICE_PLUGINS+=", networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin,networking_sfc.services.sfc.plugin.SfcPlugin" + fi fi #check for ODL_ENABLE_L3_FWD cat >> ${local_conf_file_name} << EOF -- 2.36.6