openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Be more inclusive in insecure registry regex" into stable/newton

This commit is contained in:
Jenkins 2016-11-28 15:39:31 +00:00 committed by Gerrit Code Review
parent 7f607a261d 5302f6c7a3
commit 720309e04c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/firstboot/start_docker_agents.sh
View File

@ -25,7 +25,7 @@ if [ "$docker_namespace_is_registry" = True ]; then
# if namespace is used with local registry, trim all namespacing
trim_var=$docker_registry
registry_host="${trim_var%%/*}"
/bin/sed -i "s/# INSECURE_REGISTRY='--insecure-registry[ ]'/INSECURE_REGISTRY='--insecure-registry $registry_host'/g" /etc/sysconfig/docker
/bin/sed -i -r "s/^[# ]*INSECURE_REGISTRY *=.+$/INSECURE_REGISTRY='--insecure-registry $registry_host'/" /etc/sysconfig/docker
/usr/bin/systemctl start --no-block docker.service
fi