X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fhorizon.yaml;h=5797b207bdada0d4b855b5a56883879db637e03d;hb=b3a4a6e5123b767d2dacdd1915e96b850753071b;hp=022eb5dd55e5a4c42a84afbd18c2850a845d0dd0;hpb=e9cf19340a070362bc39cd1a69d38ca742bb645a;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/horizon.yaml b/docker/services/horizon.yaml
index 022eb5dd..5797b207 100644
--- 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
@@ -86,9 +90,12 @@ outputs:
               owner: apache:apache
               recurse: false
       docker_config:
-        step_3:
+        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.
@@ -99,8 +106,8 @@ outputs:
             volumes:
               - /var/log/containers/horizon:/var/log/horizon
               - /var/lib/config-data/horizon/etc/:/etc/
+        step_3:
           horizon:
-            start_order: 1
             image: *horizon_image
             net: host
             privileged: false