From d05fc01c8f48908664881bbf4e50b420d41b01b7 Mon Sep 17 00:00:00 2001 From: Alexander Maretskiy Date: Thu, 14 Apr 2016 12:43:16 +0300 Subject: [PATCH] [Rally] Load Neutron-LBaaS extension as devstack plugin Devstack has removed LBaaS extension loaded as service, so we have to load it as devstack plugin. Change-Id: Ie7a2509f2393abf83f3c1197ecd4fd2461b21b39 --- jenkins/jobs/rally.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jenkins/jobs/rally.yaml b/jenkins/jobs/rally.yaml index c5751693b3..1b41578c12 100644 --- a/jenkins/jobs/rally.yaml +++ b/jenkins/jobs/rally.yaml @@ -87,6 +87,9 @@ ENABLED_SERVICES+=aodh-api,aodh-evaluator,aodh-notifier, if [ $DEVSTACK_GATE_NEUTRON -ne 1 ]; then ENABLED_SERVICES+=n-net,n-api-meta, + else + export PROJECTS="openstack/neutron-lbaas $PROJECTS" + DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas git://git.openstack.org/openstack/neutron-lbaas" fi if [ $DEVSTACK_GATE_IRONIC -ne 0 ]; then export PROJECTS="openstack/ironic $PROJECTS" @@ -777,7 +780,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - services=key,mysql,rabbit,n-api,n-cond,n-cpu,n-crt,n-sch,g-api,g-reg,q-agt,q-dhcp,q-l3,q-lbaas,q-meta,q-svc + services=key,mysql,rabbit,n-api,n-cond,n-cpu,n-crt,n-sch,g-api,g-reg,q-agt,q-dhcp,q-l3,q-meta,q-svc # n-obj has been removed from mitaka if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then services+=,n-obj,