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/install_docker_agents.yaml | |
| parent | 4af63c0b17c89799c57efb45bcf575110d54d9e3 (diff) | |
| parent | 255f4fd69e6bdf8247bc2861fa830859fffbef33 (diff) | |
Merge "Minor fixes to allow local docker registry usage"
Diffstat (limited to 'docker/firstboot/install_docker_agents.yaml')
| -rw-r--r-- | docker/firstboot/install_docker_agents.yaml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/docker/firstboot/install_docker_agents.yaml b/docker/firstboot/install_docker_agents.yaml index 348c1755..2858552f 100644 --- a/docker/firstboot/install_docker_agents.yaml +++ b/docker/firstboot/install_docker_agents.yaml @@ -3,7 +3,7 @@ heat_template_version: 2014-10-16 parameters: DockerAgentImage: type: string - default: tripleoupstream/heat-docker-agents + default: heat-docker-agents DockerNamespace: type: string default: kollaglue @@ -26,7 +26,10 @@ resources: config: str_replace: params: - $agent_image: {get_param: DockerAgentImage} + $agent_image: + list_join: + - '/' + - [ {get_param: DockerNamespace}, {get_param: DockerAgentImage} ] $docker_registry: {get_param: DockerNamespace} $docker_namespace_is_registry: {get_param: DockerNamespaceIsRegistry} template: {get_file: ./start_docker_agents.sh} |