From a474ae82d5f157a48c997fb9df420442bd79dcbe Mon Sep 17 00:00:00 2001
From: Martin André <m.andre@redhat.com>
Date: Fri, 23 Jun 2017 18:21:43 +0200
Subject: Add heat parameter for all of config_volume images

This commit consistently defines a heat template parameter in the form
of DockerXXXConfigImage where XXX represents the name of the
config_volume that is used by docker-puppet.

The goal is to mitigate hard to debug errors where the templates would
set different defaults for the image docker-puppet.py uses to run, for
the same config_volume name.

This fixes a couple of inconsistencies on the way.

Change-Id: I212020a76622a03521385a6cae4ce73e51ce5b6b
Closes-Bug: #1699791
---
 docker/services/heat-engine.yaml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'docker/services/heat-engine.yaml')

diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml
index 7a3312dd..676dbb1f 100644
--- a/docker/services/heat-engine.yaml
+++ b/docker/services/heat-engine.yaml
@@ -12,6 +12,10 @@ parameters:
     description: image
     default: 'centos-binary-heat-engine:latest'
     type: string
+  DockerHeatConfigImage:
+    description: The container image to use for the heat config_volume
+    default: 'centos-binary-heat-api:latest'
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -67,10 +71,10 @@ outputs:
         config_volume: heat
         puppet_tags: heat_config,file,concat,file_line
         step_config: *step_config
-        config_image: &heat_engine_image
+        config_image:
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerHeatEngineImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerHeatConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/heat_engine.json:
           command: /usr/bin/heat-engine --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf
@@ -82,7 +86,10 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           heat_init_log:
-            image: *heat_engine_image
+            image: &heat_engine_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerHeatEngineImage} ]
             user: root
             volumes:
               - /var/log/containers/heat:/var/log/heat
-- 
cgit 1.2.3-korg