openstack
/
python-tripleoclient
Code Issues Proposed changes

Deprecate docker config options 

The docker_bip, docker_insecure_registries and docker_registry_mirror
have been deprecated. docker_bip will be removed in later versions.
docker_insecure_registries has been renamed to
container_insecure_regiestries. docker_registry_mirror has been renamed
to container_registry_mirror.

Change-Id: Ic39e665b241aed74347be5eaf24fb291035d5658
Related-Blueprint: podman-support
This commit is contained in:
Alex Schultz 2019-02-20 12:16:22 -07:00
parent 1e6c2f0803
commit 96c9a5e7b8
6 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
releasenotes/notes/deprecate-docker-config-options-ebf403648b096929.yaml Normal file
View File

@ -0,0 +1,8 @@
---
deprecations:
- |
`docker_bip` undercloud configuration option will be removed.
- |
`docker_insecure_registries` has been deprecated for `container_insecure_registries`
- |
`docker_registry_mirror` has been deprecated for `container_registry_mirror`

14
tripleoclient/config/standalone.py
View File

@ -188,16 +188,18 @@ class StandaloneConfig(BaseConfig):
'any derived values. This should be used '
'only by advanced users.')),
# docker config bits
cfg.StrOpt('docker_registry_mirror',
cfg.StrOpt('container_registry_mirror',
deprecated_name='docker_registry_mirror',
default='',
help=_(
'An optional docker \'registry-mirror\' that will '
'be configured in /etc/docker/daemon.json.')
'An optional container registry mirror that will '
'be used.')
),
cfg.ListOpt('docker_insecure_registries',
cfg.ListOpt('container_insecure_registries',
deprecated_name='docker_insecure_registries',
default=[],
help=_('Used to add custom insecure registries in '
'/etc/sysconfig/docker.')
help=_('Used to add custom insecure registries for '
'containers.')
),
cfg.StrOpt('container_cli',
default='podman',

1
tripleoclient/config/undercloud.py
View File

@ -216,6 +216,7 @@ class UndercloudConfig(StandaloneConfig):
),
cfg.StrOpt('docker_bip',
default='--bip=172.31.0.1/24',
deprecated_for_removal=True,
help=_('Docker bridge IP for the undercloud.')
),

8
tripleoclient/tests/config/test_config_standalone.py
View File

@ -28,10 +28,10 @@ class TestStandaloneConfig(base.TestCase):
expected = ['cleanup',
'container_cli',
'container_images_file',
'container_insecure_registries',
'container_registry_mirror',
'custom_env_files',
'deployment_user',
'docker_insecure_registries',
'docker_registry_mirror',
'heat_container_image',
'heat_native',
'hieradata_override',
@ -88,10 +88,10 @@ class TestStandaloneConfig(base.TestCase):
expected = ['cleanup',
'container_cli',
'container_images_file',
'container_insecure_registries',
'container_registry_mirror',
'custom_env_files',
'deployment_user',
'docker_insecure_registries',
'docker_registry_mirror',
'enable_cinder',
'enable_ironic',
'enable_ironic_inspector',

8
tripleoclient/tests/config/test_config_undercloud.py
View File

@ -31,12 +31,12 @@ class TestUndercloudConfig(base.TestCase):
'cleanup',
'container_cli',
'container_images_file',
'container_insecure_registries',
'container_registry_mirror',
'custom_env_files',
'deployment_user',
'discovery_default_driver',
'docker_bip',
'docker_insecure_registries',
'docker_registry_mirror',
'enable_node_discovery',
'enable_routed_networks',
'enable_swift_encryption',
@ -85,12 +85,12 @@ class TestUndercloudConfig(base.TestCase):
'cleanup',
'container_cli',
'container_images_file',
'container_insecure_registries',
'container_registry_mirror',
'custom_env_files',
'deployment_user',
'discovery_default_driver',
'docker_bip',
'docker_insecure_registries',
'docker_registry_mirror',
'enable_cinder',
'enable_ironic',
'enable_ironic_inspector',

11
tripleoclient/v1/undercloud_config.py
View File

@ -73,7 +73,6 @@ PARAMETER_MAPPING = {
'local_subnet': 'UndercloudCtlplaneLocalSubnet',
'enable_routed_networks': 'UndercloudEnableRoutedNetworks',
'local_interface': 'NeutronPublicInterface',
'docker_bip': 'DockerNetworkOptions'
}
SUBNET_PARAMETER_MAPPING = {
@ -416,12 +415,16 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
env_data['DockerInsecureRegistryAddress'].append(
'%s:8787' % CONF['undercloud_admin_host'])
env_data['DockerInsecureRegistryAddress'].extend(
CONF['docker_insecure_registries'])
CONF['container_insecure_registries'])
env_data['ContainerCli'] = CONF['container_cli']
if CONF.get('docker_registry_mirror', None):
env_data['DockerRegistryMirror'] = CONF['docker_registry_mirror']
# NOTE(aschultz): deprecated in Stein
if CONF.get('docker_bip', None):
env_data['DockerNetworkOptions'] = CONF['docker_bip']
if CONF.get('container_registry_mirror', None):
env_data['DockerRegistryMirror'] = CONF['container_registry_mirror']
# This parameter the IP address used to bind the local container registry
env_data['LocalContainerRegistry'] = CONF['local_ip'].split('/')[0]