openstack/project-config
Code Issues Proposed changes

Remove OVERRIDE_ENABLED_SERVICES from neutron yaml files

Browse Source 
This lets the devstack gate setup the service list properly.

Change-Id: I582e1a742babce9bcb96ada60f5bc72a5bb6513a
Closes-bug: #1521846
This commit is contained in:
Brian Haley 2015-12-02 11:18:04 -05:00
parent f09d4d6d15
commit 772b5aca57
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jenkins/jobs/neutron.yaml
View File

@ -62,13 +62,6 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
# Start with the base set of services
OVERRIDE_ENABLED_SERVICES=mysql,rabbit,key,tempest,g-api,g-reg
# Add Nova services (except for nova-network)
OVERRIDE_ENABLED_SERVICES+=,n-api,n-cond,n-cpu,n-crt,n-obj,n-sch
# Enable Neutron
OVERRIDE_ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-l3,q-agt
export OVERRIDE_ENABLED_SERVICES
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=1
@ -325,13 +318,6 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
# Start with the base set of services
OVERRIDE_ENABLED_SERVICES=mysql,rabbit,key,tempest,g-api,g-reg
# Add Nova services (except for nova-network)
OVERRIDE_ENABLED_SERVICES+=,n-api,n-cond,n-cpu,n-crt,n-obj,n-sch
# Enable Neutron
OVERRIDE_ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-l3,q-agt
export OVERRIDE_ENABLED_SERVICES
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=1

7
jenkins/jobs/scalpels.yaml
View File

@ -13,13 +13,6 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
# Start with the base set of services
OVERRIDE_ENABLED_SERVICES=mysql,rabbit,key,g-api,g-reg
# Add Nova services (except for nova-network)
OVERRIDE_ENABLED_SERVICES+=,n-api,n-cond,n-cpu,n-crt,n-obj,n-sch
# Enable Neutron
OVERRIDE_ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-l3,q-agt
export OVERRIDE_ENABLED_SERVICES
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_NEUTRON=1