From ff54f74506919e57cd97fa0594b2ea087c234d8b Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Tue, 5 Dec 2017 16:05:20 -0500 Subject: [PATCH] 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 --- elements/puppet-stack-config/puppet-stack-config.yaml.template | 1 + 1 file changed, 1 insertion(+) diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template index d7864d083..aca4eeb05 100644 --- a/elements/puppet-stack-config/puppet-stack-config.yaml.template +++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template @@ -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')}"