openstack
/
python-tripleoclient
Code Issues Proposed changes

Drop the port from DockerInsecureRegistryAddress 

This is causing a problem with buildah/podman when they consume the
populated /etc/containers/registries.conf. When deployed with docker
the original behaviour is maintained.

Change-Id: I1f2f2690330af1f7b143c01affe088f954df8d7c
Closes-Bug: #1831152
This commit is contained in:
Steve Baker 2019-05-31 09:02:48 +12:00
parent 2b3b7f1e1f
commit b44d6f84ed
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tripleoclient/v1/undercloud_config.py
View File

@ -418,10 +418,16 @@ 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'])
env_data['DockerInsecureRegistryAddress'] = [
'%s:8787' % CONF['local_ip'].split('/')[0]]
env_data['DockerInsecureRegistryAddress'].append(
'%s:8787' % CONF['undercloud_admin_host'])
if CONF.get('container_cli', 'podman') == 'podman':
env_data['DockerInsecureRegistryAddress'] = [
CONF['local_ip'].split('/')[0]]
env_data['DockerInsecureRegistryAddress'].append(
CONF['undercloud_admin_host'])
else:
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['container_insecure_registries'])