diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-02-15 19:24:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-02-15 19:24:01 +0000 |
| commit | 014ed92b4e614c4e68bc95a65666c228a72d4997 (patch) | |
| tree | 32148f245ce4ff7111c93f00b873750e307117af /docker/firstboot/start_docker_agents.sh | |
| parent | 4af63c0b17c89799c57efb45bcf575110d54d9e3 (diff) | |
| parent | 255f4fd69e6bdf8247bc2861fa830859fffbef33 (diff) | |
Merge "Minor fixes to allow local docker registry usage"
Diffstat (limited to 'docker/firstboot/start_docker_agents.sh')
| -rw-r--r-- | docker/firstboot/start_docker_agents.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/firstboot/start_docker_agents.sh b/docker/firstboot/start_docker_agents.sh index a0e95d11..2b03b96e 100644 --- a/docker/firstboot/start_docker_agents.sh +++ b/docker/firstboot/start_docker_agents.sh @@ -39,7 +39,10 @@ EOF # Local docker registry 1.8 if [ $docker_namespace_is_registry ]; then - /bin/sed -i "s/# INSECURE_REGISTRY='--insecure-registry '/INSECURE_REGISTRY='--insecure-registry $docker_registry'/g" /etc/sysconfig/docker + # 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 fi /sbin/setenforce 0 |