X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fsahara-engine.yaml;h=1b11ab7dac84825ab3051c8b6367c9c8b58512d7;hb=fff554e776d420be56c48c4605f2152e5df7f735;hp=41b5790bf854eca4fae8f67a223881b968a2611a;hpb=d68a938d14f6eb9d143cd9abee9ff5e2d16ae6dd;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/sahara-engine.yaml b/docker/services/sahara-engine.yaml
index 41b5790b..1b11ab7d 100644
--- a/docker/services/sahara-engine.yaml
+++ b/docker/services/sahara-engine.yaml
@@ -12,6 +12,10 @@ parameters:
     description: image
     default: 'centos-binary-sahara-engine:latest'
     type: string
+  DockerSaharaConfigImage:
+    description: The container image to use for the sahara config_volume
+    default: 'centos-binary-sahara-api:latest'
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -64,13 +68,18 @@ outputs:
         config_volume: sahara
         puppet_tags: sahara_engine_paste_ini,sahara_cluster_template,sahara_config,sahara_node_group_template
         step_config: *step_config
-        config_image: &sahara_image
+        config_image:
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerSaharaEngineImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerSaharaConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/sahara-engine.json:
           command: /usr/bin/sahara-engine --config-file /etc/sahara/sahara.conf
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/lib/sahara
               owner: sahara:sahara
@@ -81,16 +90,19 @@ outputs:
       docker_config:
         step_4:
           sahara_engine:
-            image: *sahara_image
+            image:
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerSaharaEngineImage} ]
             net: host
             privileged: false
             restart: always
-            volumes: &sahara_volumes
+            volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/sahara-engine.json:/var/lib/kolla/config_files/config.json
-                  - /var/lib/config-data/sahara/etc/sahara/:/etc/sahara/:ro
+                  - /var/lib/config-data/puppet-generated/sahara/:/var/lib/kolla/config_files/src:ro
                   - /var/lib/sahara:/var/lib/sahara
                   - /var/log/containers/sahara:/var/log/sahara
             environment: