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/octavia-api.yaml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

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

diff --git a/docker/services/octavia-api.yaml b/docker/services/octavia-api.yaml
index 247dcba3..728162fe 100644
--- a/docker/services/octavia-api.yaml
+++ b/docker/services/octavia-api.yaml
@@ -12,6 +12,10 @@ parameters:
     description: image
     default: 'centos-binary-octavia-api:latest'
     type: string
+  DockerOctaviaConfigImage:
+    description: The container image to use for the octavia config_volume
+    default: 'centos-binary-octavia-api:latest'
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -71,10 +75,10 @@ outputs:
         config_volume: octavia
         puppet_tags: octavia_config
         step_config: *step_config
-        config_image: &octavia_image
+        config_image:
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaApiImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/octavia_api.json:
           command: /usr/bin/octavia-api --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/api.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-api
@@ -85,7 +89,10 @@ outputs:
         step_2:
           octavia_api_init_dirs:
             start_order: 0
-            image: *octavia_image
+            image: &octavia_api_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaApiImage} ]
             user: root
             volumes:
               - /var/lib/config-data/octavia/etc/octavia:/etc/octavia/
@@ -94,7 +101,7 @@ outputs:
         step_3:
           octavia_db_sync:
             start_order: 0
-            image: *octavia_image
+            image: *octavia_api_image
             net: host
             privileged: false
             detach: false
@@ -111,7 +118,7 @@ outputs:
           map_merge:
             - octavia_api:
                 start_order: 2
-                image: *octavia_image
+                image: *octavia_api_image
                 net: host
                 privileged: false
                 restart: always
@@ -122,7 +129,7 @@ outputs:
                 - internal_tls_enabled
                 - octavia_api_tls_proxy:
                     start_order: 2
-                    image: *octavia_image
+                    image: *octavia_api_image
                     net: host
                     user: root
                     restart: always
-- 
cgit 1.2.3-korg