Merge "Update deletion date for (zone|pool)-manager"

This commit is contained in:
Zuul 2018-01-04 17:17:07 +00:00 committed by Gerrit Code Review
commit f004e6edb5
3 changed files with 13 additions and 8 deletions

View File

@ -18,9 +18,9 @@ import sys
from oslo_config import cfg
from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr
import debtcollector
from designate.i18n import _LE
from designate.i18n import _LW
from designate import service
from designate import utils
from designate import version
@ -51,9 +51,9 @@ def main():
'designate-worker instead.'))
sys.exit(1)
LOG.warning(_LW('designate-pool-manager is DEPRECATED in favor of '
'designate-worker and will be removed during the Ocata '
'cycle'))
debtcollector.deprecate('designate-pool-manager is deprecated in favor of '
'designate-worker', version='newton',
removal_version='rocky')
server = pool_manager_service.Service(
threads=CONF['service:pool_manager'].threads

View File

@ -18,6 +18,7 @@ import sys
from oslo_config import cfg
from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr
import debtcollector
from designate.i18n import _LE
from designate.i18n import _LW
@ -42,6 +43,7 @@ def main():
# NOTE(timsim): This is to ensure people don't start the wrong
# services when the worker model is enabled.
if cfg.CONF['service:worker'].enabled:
LOG.error(_LE('You have designate-worker enabled, starting '
'designate-zone-manager is incompatible with '
@ -49,9 +51,12 @@ def main():
'designate-producer instead.'))
sys.exit(1)
LOG.warning(_LW('designate-zone-manager is DEPRECATED in favor of '
'designate-producer, starting designate-producer '
'under the zone-manager name'))
debtcollector.deprecate('designate-zone-manager Is deprecated in '
'favor of the designate-producer',
version='newton',
removal_version='rocky')
LOG.warning(_LW('Starting designate-producer under the zone-manager name'))
server = producer_service.Service(
threads=CONF['service:zone_manager'].threads)

View File

@ -26,7 +26,7 @@ OPTS = [
help='Whether to send events to worker instead of '
'Pool Manager',
deprecated_for_removal=True,
deprecated_reason='In Newton, this option will disappear'
deprecated_reason='In Rocky, this option will disappear '
'because worker will be enabled by default'),
cfg.IntOpt('workers',
help='Number of Worker worker processes to spawn'),