Merge "docker bootstrap service commands"

[apex-tripleo-heat-templates.git] / docker / docker-steps.j2

diff --git a/docker/docker-steps.j2 b/docker/docker-steps.j2
index e24afcf..86811b8 100644 (file)
--- a/docker/docker-steps.j2
+++ b/docker/docker-steps.j2
@@ -102,13 +102,6 @@ resources:
       servers:  {get_param: [servers, {{role.name}}]}
       config: {get_resource: {{role.name}}ArtifactsConfig}
 
-  {{role.name}}PreConfig:
-    type: OS::TripleO::Tasks::{{role.name}}PreConfig
-    properties:
-      servers: {get_param: [servers, {{role.name}}]}
-      input_values:
-        update_identifier: {get_param: DeployIdentifier}
-
   {{role.name}}HostPrepConfig:
     type: OS::Heat::SoftwareConfig
     properties:
@@ -277,6 +270,7 @@ resources:
         {%- endfor %}
       - {{role.name}}PreConfig
       - {{role.name}}HostPrepDeployment
+      - {{role.name}}GenerateConfigDeployment
   {% else %}
     depends_on:
         {% for dep in roles %}