Merge "Removes old environment file references"

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

diff --git a/docker/post.j2.yaml b/docker/post.j2.yaml
index 3473f4c..76232d1 100644 (file)
--- a/docker/post.j2.yaml
+++ b/docker/post.j2.yaml
@@ -68,6 +68,7 @@ resources:
         - name: CONFIG
         - name: NET_HOST
         - name: NO_ARCHIVE
+        - name: STEP
 
   {{primary_role_name}}DockerPuppetTasksDeployment{{step}}:
     type: OS::Heat::SoftwareDeployment
@@ -85,6 +86,7 @@ resources:
         CONFIG: /var/lib/docker-puppet/docker-puppet-tasks{{step}}.json
         NET_HOST: 'true'
         NO_ARCHIVE: 'true'
+        STEP: {{step}}
 
 {% endfor %}
 # END primary_role_name docker-puppet-tasks
@@ -128,16 +130,7 @@ resources:
       group: json-file
       config:
         /var/lib/docker-puppet/docker-puppet.json:
-          yaql:
-            # select only services that have a non-null config_image with
-            # a step_config as well
-            expression:
-              $.data.config_volume.zip($.data.puppet_tags, $.data.step_config, $.data.config_image).where($[3] != null and $[1] != null)
-            data:
-              config_volume: {get_param: [role_data, {{role.name}}, config_volume]}
-              step_config: {get_param: [role_data, {{role.name}}, step_config]}
-              puppet_tags: {get_param: [role_data, {{role.name}}, puppet_tags]}
-              config_image: {get_param: [role_data, {{role.name}}, config_image]}
+          {get_param: [role_data, {{role.name}}, puppet_config]}
 
   {{role.name}}GenPuppetDeployment:
     type: OS::Heat::SoftwareDeploymentGroup
@@ -187,6 +180,24 @@ resources:
             docker_config: {get_param: [role_data, {{role.name}}, docker_config]}
             docker_image: {get_param: [role_data, {{role.name}}, docker_image]}
 
+  # Here we are dumping all the docker container startup configuration data
+  # so that we can have access to how they are started outside of heat
+  # and docker-cmd.  This lets us create command line tools to start and
+  # test these containers.
+  {{role.name}}DockerConfigJsonStartupData:
+    type: OS::Heat::StructuredConfig
+    properties:
+      group: json-file
+      config:
+        /var/lib/docker-container-startup-configs.json:
+          {get_attr: [{{role.name}}DockerConfig, value]}
+
+  {{role.name}}DockerConfigJsonStartupDataDeployment:
+    type: OS::Heat::SoftwareDeploymentGroup
+    properties:
+      config: {get_resource: {{role.name}}DockerConfigJsonStartupData}
+      servers: {get_param: [servers, {{role.name}}]}
+
   {{role.name}}KollaJsonConfig:
     type: OS::Heat::StructuredConfig
     properties: