Merge "adding --config-dir parameters to neutron containers"

[apex-tripleo-heat-templates.git] / docker / services / aodh-evaluator.yaml

diff --git a/docker/services/aodh-evaluator.yaml b/docker/services/aodh-evaluator.yaml
index 74ac635..108a552 100644 (file)
--- a/docker/services/aodh-evaluator.yaml
+++ b/docker/services/aodh-evaluator.yaml
@@ -12,6 +12,10 @@ parameters:
     description: image
     default: 'centos-binary-aodh-evaluator:latest'
     type: string
+  DockerAodhConfigImage:
+    description: The container image to use for the aodh config_volume
+    default: 'centos-binary-aodh-api:latest'
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -65,10 +69,10 @@ outputs:
         config_volume: aodh
         puppet_tags: aodh_config
         step_config: *step_config
-        config_image: &aodh_evaluator_image
+        config_image:
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerAodhEvaluatorImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerAodhConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/aodh_evaluator.json:
           command: /usr/bin/aodh-evaluator
@@ -79,7 +83,10 @@ outputs:
       docker_config:
         step_4:
           aodh_evaluator:
-            image: *aodh_evaluator_image
+            image:
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerAodhEvaluatorImage} ]
             net: host
             privileged: false
             restart: always