openstack
/
instack-undercloud
Code Issues Proposed changes

Use the docker profile to set INSECURE_REGISTRY 

This patch updates our instack-undercloud configuration so that
we leverage the tripleo::profile::base::docker manifest's
insecure_registry parameter to manage INSECURE_REGISTRY.
This makes sense since that setting is directly related to
the docker service itself and not the docker registry.

This can prevent these two manifests from clobbering each others
settings if they are both used alongside of each other.

Change-Id: I9e9c495b9095590dcee14e0705728c68c058d2b5
Related-bug: #1736587
This commit is contained in:
Dan Prince 2017-12-05 16:05:20 -05:00
parent 758e8caee0
commit ff54f74506
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/puppet-stack-config/puppet-stack-config.yaml.template
View File

@ -763,6 +763,7 @@ tripleo::profile::base::docker::docker_options: '--log-driver=journald --signatu
tripleo::profile::base::docker::registry_mirror: {{DOCKER_REGISTRY_MIRROR}}
{{/DOCKER_REGISTRY_MIRROR}}
tripleo::profile::base::docker::debug: "%{hiera('debug')}"
tripleo::profile::base::docker::insecure_registries: ['{{LOCAL_IP}}:8787','{{UNDERCLOUD_ADMIN_HOST}}:8787']
# Keepalived
tripleo::keepalived::controller_virtual_ip: "%{hiera('controller_admin_host')}"