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-health-manager.yaml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

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

diff --git a/docker/services/octavia-health-manager.yaml b/docker/services/octavia-health-manager.yaml
index 534a35fe..2228e369 100644
--- a/docker/services/octavia-health-manager.yaml
+++ b/docker/services/octavia-health-manager.yaml
@@ -12,6 +12,10 @@ parameters:
     description: image
     default: 'centos-binary-octavia-health-manager: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
@@ -64,10 +68,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: DockerOctaviaHealthManagerImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/octavia_health_manager.json:
           command: /usr/bin/octavia-health-manager --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/health-manager.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-health-manager
@@ -75,7 +79,10 @@ outputs:
         step_2:
           octavia_health_manager_init_dirs:
             start_order: 0
-            image: *octavia_image
+            image: &octavia_health_manager_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaHealthManagerImage} ]
             user: root
             volumes:
               - /var/lib/config-data/octavia/etc/octavia:/etc/octavia/
@@ -83,7 +90,7 @@ outputs:
         step_4:
           octavia_health_manager:
             start_order: 2
-            image: *octavia_image
+            image: *octavia_health_manager_image
             net: host
             privileged: false
             restart: always
-- 
cgit 1.2.3-korg