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/swift-ringbuilder.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docker/services/swift-ringbuilder.yaml')

diff --git a/docker/services/swift-ringbuilder.yaml b/docker/services/swift-ringbuilder.yaml
index 075d8d7c..00a772d6 100644
--- a/docker/services/swift-ringbuilder.yaml
+++ b/docker/services/swift-ringbuilder.yaml
@@ -8,8 +8,8 @@ parameters:
     description: namespace
     default: 'tripleoupstream'
     type: string
-  DockerSwiftProxyImage:
-    description: image
+  DockerSwiftConfigImage:
+    description: The container image to use for the swift config_volume
     default: 'centos-binary-swift-proxy-server:latest'
     type: string
   ServiceNetMap:
@@ -98,6 +98,6 @@ outputs:
         config_image:
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerSwiftConfigImage} ]
       kolla_config: {}
       docker_config: {}
-- 
cgit 1.2.3-korg