openstack/project-config
Code Issues Proposed changes

Merge "Remove q-lbaas from the nodepool pre-configured list"

Browse Source
This commit is contained in:
Jenkins 2016-08-23 22:24:56 +00:00 committed by Gerrit Code Review
commit 48a05464ea
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jenkins/jobs/nodepool.yaml
View File

@ -23,7 +23,7 @@
export DEVSTACK_GATE_REMOVE_STACK_SUDO=0 export DEVSTACK_GATE_REMOVE_STACK_SUDO=0
# Override so we get a bare minimum set of base compute services # Override so we get a bare minimum set of base compute services
# required to have nodepool function. # required to have nodepool function.
OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-lbaas,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy
# n-obj has been removed from mitaka # n-obj has been removed from mitaka
if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
OVERRIDE_ENABLED_SERVICES+=,n-obj, OVERRIDE_ENABLED_SERVICES+=,n-obj,
@ -79,7 +79,7 @@
export DEVSTACK_GATE_REMOVE_STACK_SUDO=0 export DEVSTACK_GATE_REMOVE_STACK_SUDO=0
# Override so we get a bare minimum set of base compute services # Override so we get a bare minimum set of base compute services
# required to have nodepool function. # required to have nodepool function.
OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-lbaas,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy
# n-obj has been removed from mitaka # n-obj has been removed from mitaka
if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
OVERRIDE_ENABLED_SERVICES+=,n-obj, OVERRIDE_ENABLED_SERVICES+=,n-obj,
@ -140,7 +140,7 @@
# required to have nodepool function. # required to have nodepool function.
OVERRIDE_ENABLED_SERVICES="dstat,g-api,g-reg,key,mysql,rabbit" OVERRIDE_ENABLED_SERVICES="dstat,g-api,g-reg,key,mysql,rabbit"
OVERRIDE_ENABLED_SERVICES+=",n-api,n-cond,n-cpu,n-crt,n-sch" OVERRIDE_ENABLED_SERVICES+=",n-api,n-cond,n-cpu,n-crt,n-sch"
OVERRIDE_ENABLED_SERVICES+=",q-agt,q-dhcp,q-l3,q-lbaas,q-meta,q-metering,q-svc" OVERRIDE_ENABLED_SERVICES+=",q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc"
OVERRIDE_ENABLED_SERVICES+=",s-account,s-container,s-object,s-proxy" OVERRIDE_ENABLED_SERVICES+=",s-account,s-container,s-object,s-proxy"
export OVERRIDE_ENABLED_SERVICES export OVERRIDE_ENABLED_SERVICES
export BRANCH_OVERRIDE={branch-override} export BRANCH_OVERRIDE={branch-override}