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/mistral-api.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'docker/services/mistral-api.yaml')

diff --git a/docker/services/mistral-api.yaml b/docker/services/mistral-api.yaml
index 30c3cde1..f1284280 100644
--- a/docker/services/mistral-api.yaml
+++ b/docker/services/mistral-api.yaml
@@ -13,7 +13,7 @@ parameters:
     default: 'centos-binary-mistral-api:latest'
     type: string
   DockerMistralConfigImage:
-    description: image
+    description: The container image to use for the mistral config_volume
     default: 'centos-binary-mistral-api:latest'
     type: string
   EndpointMap:
@@ -84,7 +84,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           mistral_init_logs:
-            image: &mistral_image
+            image: &mistral_api_image
               list_join:
                 - '/'
                 - [ {get_param: DockerNamespace}, {get_param: DockerMistralApiImage} ]
@@ -96,7 +96,7 @@ outputs:
         step_3:
           mistral_db_sync:
             start_order: 0
-            image: *mistral_image
+            image: *mistral_api_image
             net: host
             privileged: false
             detach: false
@@ -110,7 +110,7 @@ outputs:
             command: "/usr/bin/bootstrap_host_exec mistral_api su mistral -s /bin/bash -c 'mistral-db-manage --config-file /etc/mistral/mistral.conf upgrade head'"
           mistral_db_populate:
             start_order: 1
-            image: *mistral_image
+            image: *mistral_api_image
             net: host
             privileged: false
             detach: false
@@ -127,7 +127,7 @@ outputs:
         step_4:
           mistral_api:
             start_order: 15
-            image: *mistral_image
+            image: *mistral_api_image
             net: host
             privileged: false
             restart: always
-- 
cgit 1.2.3-korg