X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fmistral-api.yaml;h=4b2c10285b0046c74e54a6665ae6564ef645953f;hb=fe3bf6271a46a2bfe7bb902e5e14aa8e257f9e31;hp=cc7e613eccf15eeada7fbac70286d69f9e149b14;hpb=9e759c971d993e2f9034ec6068dd0ddf1faf2740;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/mistral-api.yaml b/docker/services/mistral-api.yaml
index cc7e613e..4b2c1028 100644
--- a/docker/services/mistral-api.yaml
+++ b/docker/services/mistral-api.yaml
@@ -13,7 +13,7 @@ parameters:
     default: 'centos-binary-mistral-api:latest'
     type: string
   DockerMistralConfigImage:
-    description: image
+    description: The container image to use for the mistral config_volume
     default: 'centos-binary-mistral-api:latest'
     type: string
   EndpointMap:
@@ -76,16 +76,20 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/mistral_api.json:
           command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/api.log --server=api
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/log/mistral
               owner: mistral:mistral
               recurse: true
       docker_config:
         # db sync runs before permissions set by kolla_config
-        step_3:
+        step_2:
           mistral_init_logs:
-            start_order: 0
-            image: &mistral_image
+            image: &mistral_api_image
               list_join:
                 - '/'
                 - [ {get_param: DockerNamespace}, {get_param: DockerMistralApiImage} ]
@@ -94,9 +98,10 @@ outputs:
             volumes:
               - /var/log/containers/mistral:/var/log/mistral
             command: ['/bin/bash', '-c', 'chown -R mistral:mistral /var/log/mistral']
+        step_3:
           mistral_db_sync:
-            start_order: 1
-            image: *mistral_image
+            start_order: 0
+            image: *mistral_api_image
             net: host
             privileged: false
             detach: false
@@ -109,8 +114,8 @@ outputs:
                   - /var/log/containers/mistral:/var/log/mistral
             command: "/usr/bin/bootstrap_host_exec mistral_api su mistral -s /bin/bash -c 'mistral-db-manage --config-file /etc/mistral/mistral.conf upgrade head'"
           mistral_db_populate:
-            start_order: 2
-            image: *mistral_image
+            start_order: 1
+            image: *mistral_api_image
             net: host
             privileged: false
             detach: false
@@ -127,7 +132,7 @@ outputs:
         step_4:
           mistral_api:
             start_order: 15
-            image: *mistral_image
+            image: *mistral_api_image
             net: host
             privileged: false
             restart: always
@@ -136,7 +141,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/mistral_api.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
+                  - /var/lib/config-data/puppet-generated/mistral/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/mistral:/var/log/mistral
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS