Merge "Split OVN northd and ml2 plugin"

[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 22a8ff9..f6d61e2 100644 (file)
--- a/docker/firstboot/install_docker_agents.yaml
+++ b/docker/firstboot/install_docker_agents.yaml
@@ -3,10 +3,10 @@ heat_template_version: 2014-10-16
 parameters:
   DockerAgentImage:
     type: string
-    default: dprince/heat-docker-agents-centos
+    default: heat-docker-agents
   DockerNamespace:
     type: string
-    default: kollaglue
+    default: tripleoupstream
   DockerNamespaceIsRegistry:
     type: boolean
     default: false
@@ -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}