diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-21 09:19:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-21 09:19:54 +0000 |
| commit | 13839aef6085205312f283408f11f84e7324161c (patch) | |
| tree | 158cc7d4322a765b24bf25cfd7489d01302f5d0b | |
| parent | 1c4ade1d66450a49da9cb17528d21d47e000bf80 (diff) | |
| parent | 6d41f690331b28b88dcdc614ed10019a06ed88c2 (diff) | |
Merge "Have docker start script honor configuration"
| -rw-r--r-- | docker/firstboot/start_docker_agents.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/firstboot/start_docker_agents.sh b/docker/firstboot/start_docker_agents.sh index 68625032..2431ef0a 100644 --- a/docker/firstboot/start_docker_agents.sh +++ b/docker/firstboot/start_docker_agents.sh @@ -18,7 +18,9 @@ echo "127.0.0.1 $HOSTNAME.localdomain $HOSTNAME" >> /etc/hosts #echo "ADD_REGISTRY='--registry-mirror $docker_registry'" >> /etc/sysconfig/docker # Local docker registry 1.8 -if [ $docker_namespace_is_registry ]; then +# NOTE(mandre) $docker_namespace_is_registry is not a bash variable but is +# a place holder for text replacement done via heat +if [ "$docker_namespace_is_registry" = True ]; then /usr/bin/systemctl stop docker.service # if namespace is used with local registry, trim all namespacing trim_var=$docker_registry |