Merge "Undeprecate neutron-legacy scripts"

This commit is contained in:
Zuul 2020-06-15 17:15:45 +00:00 committed by Gerrit Code Review
commit 038ea9ab92
2 changed files with 3 additions and 14 deletions

View File

@ -415,22 +415,15 @@
n-cpu: true
n-novnc: true
n-sch: true
# Placement service
placement-api: true
# Neutron services
# We need to keep using the neutron-legacy based services for
# now until all issues with the new lib/neutron code are solved
q-agt: true
q-dhcp: true
q-l3: true
q-meta: true
q-metering: true
q-svc: true
# neutron-api: true
# neutron-agent: true
# neutron-dhcp: true
# neutron-l3: true
# neutron-metadata-agent: true
# neutron-metering: true
# Swift services
s-account: true
s-container: true
@ -459,12 +452,10 @@
tls-proxy: true
# Nova services
n-cpu: true
# Placement services
placement-client: true
# Neutron services
# We need to keep using the neutron-legacy based services for
# now until all issues with the new lib/neutron code are solved
q-agt: true
# neutron-agent: true
# Cinder services
c-bak: true
c-vol: true
@ -474,7 +465,7 @@
# s-*: false
horizon: false
tempest: false
# Test matrix emits ceilometer but ceilomenter is not installed in the
# Test matrix emits ceilometer but ceilometer is not installed in the
# integrated gate, so specifying the services has not effect.
# ceilometer-*: false
devstack_localrc:

View File

@ -58,8 +58,6 @@
# Neutron Network Configuration
# -----------------------------
deprecated "Using lib/neutron-legacy is deprecated, and it will be removed in the future"
if is_service_enabled tls-proxy; then
Q_PROTOCOL="https"
fi