Merge "Make ceilometer crontab removal idempotent"

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

diff --git a/docker/services/horizon.yaml b/docker/services/horizon.yaml
index 13bd091..5797b20 100644 (file)
--- a/docker/services/horizon.yaml
+++ b/docker/services/horizon.yaml
@@ -12,6 +12,10 @@ parameters:
     description: image
     default: 'centos-binary-horizon:latest'
     type: string
+  DockerHorizonConfigImage:
+    description: The container image to use for the horizon config_volume
+    default: 'centos-binary-horizon:latest'
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -70,10 +74,10 @@ outputs:
         config_volume: horizon
         puppet_tags: horizon_config
         step_config: {get_attr: [HorizonBase, role_data, step_config]}
-        config_image: &horizon_image
+        config_image:
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerHorizonImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerHorizonConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/horizon.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -88,7 +92,10 @@ outputs:
       docker_config:
         step_2:
           horizon_fix_perms:
-            image: *horizon_image
+            image: &horizon_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerHorizonImage} ]
             user: root
             # NOTE Set ownership for /var/log/horizon/horizon.log file here,
             # otherwise it's created by root when generating django cache.