openstack
/
python-tripleoclient
Code Issues Proposed changes

Revert "Allow operators to override docker_insecure_registries" 

It doesn't help our operators since they have to hack in undercloud.conf
to avoid HTTPS errors. Let's revert this patch so the default are good
and we'll configure the insecure registries on the ip of undercloud by
default.

This reverts commit b1a31a70fd.

Change-Id: Ib61ca0dd9bcb60a19fa589445b426c0bb2fb0d51
This commit is contained in:
Emilien Macchi 2018-08-01 19:03:27 -04:00
parent 1c9f386a2f
commit 644366469e
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
releasenotes/notes/docker_insecure_registries-91324f140425d8e7.yaml
View File

@ -1,7 +0,0 @@
---
features:
- |
Allow the operators to override the INSECURE_REGISTRY parameter without
hardcoding the local_ip and the admin VIP in all the cases.
If the operators want to override the whole parameter, they now can with
docker_insecure_registries parameter in undercloud.conf.

14
tripleoclient/v1/undercloud_config.py
View File

@ -312,14 +312,12 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
env_data['NeutronDnsDomain'] = CONF['overcloud_domain_name']
deploy_args.append('--local-domain=%s' % CONF['overcloud_domain_name'])
if CONF.get('docker_insecure_registries'):
env_data['DockerInsecureRegistryAddress'] = (
CONF['docker_insecure_registries'])
else:
env_data['DockerInsecureRegistryAddress'] = [
'%s:8787' % CONF['local_ip'].split('/')[0]]
env_data['DockerInsecureRegistryAddress'].append(
'%s:8787' % CONF['undercloud_admin_host'])
env_data['DockerInsecureRegistryAddress'] = [
'%s:8787' % CONF['local_ip'].split('/')[0]]
env_data['DockerInsecureRegistryAddress'].append(
'%s:8787' % CONF['undercloud_admin_host'])
env_data['DockerInsecureRegistryAddress'].extend(
CONF['docker_insecure_registries'])
if CONF.get('docker_registry_mirror', None):
env_data['DockerRegistryMirror'] = CONF['docker_registry_mirror']