Skip to content

Commit f6597b1

Browse files
committed
Undeprecate neutron-legacy scripts
Work on the new neutron scripts has stalled and they aren't in a useable state yet. Given the ongoing decline in contributions, let us acknowledge this and undeprecate the neutron-legacy scripts so that people can continue to use them without feeling guilty about it. Change-Id: I4bce19da861abf18ddb89d82fd312c5e49a4ee7c
1 parent 761663d commit f6597b1

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

.zuul.yaml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -405,22 +405,15 @@
405405
n-cpu: true
406406
n-novnc: true
407407
n-sch: true
408+
# Placement service
408409
placement-api: true
409410
# Neutron services
410-
# We need to keep using the neutron-legacy based services for
411-
# now until all issues with the new lib/neutron code are solved
412411
q-agt: true
413412
q-dhcp: true
414413
q-l3: true
415414
q-meta: true
416415
q-metering: true
417416
q-svc: true
418-
# neutron-api: true
419-
# neutron-agent: true
420-
# neutron-dhcp: true
421-
# neutron-l3: true
422-
# neutron-metadata-agent: true
423-
# neutron-metering: true
424417
# Swift services
425418
s-account: true
426419
s-container: true
@@ -449,12 +442,10 @@
449442
tls-proxy: true
450443
# Nova services
451444
n-cpu: true
445+
# Placement services
452446
placement-client: true
453447
# Neutron services
454-
# We need to keep using the neutron-legacy based services for
455-
# now until all issues with the new lib/neutron code are solved
456448
q-agt: true
457-
# neutron-agent: true
458449
# Cinder services
459450
c-bak: true
460451
c-vol: true
@@ -464,7 +455,7 @@
464455
# s-*: false
465456
horizon: false
466457
tempest: false
467-
# Test matrix emits ceilometer but ceilomenter is not installed in the
458+
# Test matrix emits ceilometer but ceilometer is not installed in the
468459
# integrated gate, so specifying the services has not effect.
469460
# ceilometer-*: false
470461
devstack_localrc:

lib/neutron-legacy

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@
5858
# Neutron Network Configuration
5959
# -----------------------------
6060

61-
deprecated "Using lib/neutron-legacy is deprecated, and it will be removed in the future"
62-
6361
if is_service_enabled tls-proxy; then
6462
Q_PROTOCOL="https"
6563
fi

0 commit comments

Comments
 (0)