openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Remove deprecated docker_* options"

Browse Source
This commit is contained in:
Zuul 2021-07-03 00:26:12 +00:00 committed by Gerrit Code Review
commit 9526abb4f1
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
releasenotes/notes/cleanup-docker_opts-65aa01111417cadb.yaml Normal file
View File

@ -0,0 +1,7 @@
---
upgrade:
- |
The following two options have been removed.
- ``docker_registry_mirror``
- ``docker_insecure_registries``

2
tripleoclient/config/standalone.py
View File

@ -218,14 +218,12 @@ class StandaloneConfig(BaseConfig):
'only by advanced users.')), 'only by advanced users.')),
# container config bits # container config bits
cfg.StrOpt('container_registry_mirror', cfg.StrOpt('container_registry_mirror',
deprecated_name='docker_registry_mirror',
default='', default='',
help=_( help=_(
'An optional container registry mirror that will ' 'An optional container registry mirror that will '
'be used.') 'be used.')
), ),
cfg.ListOpt('container_insecure_registries', cfg.ListOpt('container_insecure_registries',
deprecated_name='docker_insecure_registries',
default=[], default=[],
help=_('Used to add custom insecure registries for ' help=_('Used to add custom insecure registries for '
'containers.') 'containers.')