Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
placement: switch service to use NovaPlacementNetwork
[apex-tripleo-heat-templates.git]
/
docker
/
firstboot
/
install_docker_agents.yaml
diff --git
a/docker/firstboot/install_docker_agents.yaml
b/docker/firstboot/install_docker_agents.yaml
index
8adc893
..
41a8740
100644
(file)
--- a/
docker/firstboot/install_docker_agents.yaml
+++ b/
docker/firstboot/install_docker_agents.yaml
@@
-1,9
+1,15
@@
-heat_template_version:
2014-10-16
+heat_template_version:
ocata
parameters:
DockerAgentImage:
type: string
parameters:
DockerAgentImage:
type: string
- default: dprince/heat-docker-agents-centos
+ default: heat-docker-agents
+ DockerNamespace:
+ type: string
+ default: tripleoupstream
+ DockerNamespaceIsRegistry:
+ type: boolean
+ default: false
resources:
resources:
@@
-20,7
+26,12
@@
resources:
config:
str_replace:
params:
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}
outputs:
template: {get_file: ./start_docker_agents.sh}
outputs: