X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fzaqar.yaml;h=ab30ab5aee32fb91c266818a85078b34076b36dd;hb=f171eca4c3fc2e18b3971bb9cd930208bf43e646;hp=df57ad6af00e6e7265113c807ea35f090680f4c7;hpb=03af5f8f4d01fe40253b355252e05548d5f50777;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml
index df57ad6a..ab30ab5a 100644
--- a/docker/services/zaqar.yaml
+++ b/docker/services/zaqar.yaml
@@ -53,8 +53,11 @@ resources:
   ContainersCommon:
     type: ./containers-common.yaml
 
+  MySQLClient:
+    type: ../../puppet/services/database/mysql-client.yaml
+
   ZaqarBase:
-    type: ../../puppet/services/zaqar.yaml
+    type: ../../puppet/services/zaqar-api.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}
@@ -71,7 +74,10 @@ outputs:
       service_name: {get_attr: [ZaqarBase, role_data, service_name]}
       config_settings: {get_attr: [ZaqarBase, role_data, config_settings]}
       step_config: &step_config
-       get_attr: [ZaqarBase, role_data, step_config]
+        list_join:
+          - "\n"
+          - - {get_attr: [ZaqarBase, role_data, step_config]}
+            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [ZaqarBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
@@ -110,6 +116,7 @@ outputs:
                   user: root
                   volumes:
                     - /var/log/containers/zaqar:/var/log/zaqar
+                    - /var/log/containers/httpd/zaqar:/var/log/httpd
                   command: ['/bin/bash', '-c', 'chown -R zaqar:zaqar /var/log/zaqar']
               step_3:
                 zaqar_db_sync:
@@ -124,7 +131,8 @@ outputs:
                       -
                         - /var/lib/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro
                         - /var/log/containers/zaqar:/var/log/zaqar
-                  command: "/usr/bin/bootstrap_host_exec zaqar su zaqar -s /bin/bash -c 'zaqar-sql-db-manage upgrade head'"
+                        - /var/log/containers/httpd/zaqar:/var/log/httpd
+                  command: "/usr/bin/bootstrap_host_exec zaqar_api su zaqar -s /bin/bash -c 'zaqar-sql-db-manage upgrade head'"
             - {}
           - step_4:
               zaqar:
@@ -142,6 +150,7 @@ outputs:
                       - /var/lib/kolla/config_files/zaqar.json:/var/lib/kolla/config_files/config.json:ro
                       - /var/lib/config-data/puppet-generated/zaqar/:/var/lib/kolla/config_files/src:ro
                       - /var/log/containers/zaqar:/var/log/zaqar
+                      - /var/log/containers/httpd/zaqar:/var/log/httpd
                       -
                         if:
                           - internal_tls_enabled
@@ -166,13 +175,17 @@ outputs:
                       - /var/lib/kolla/config_files/zaqar_websocket.json:/var/lib/kolla/config_files/config.json:ro
                       - /var/lib/config-data/puppet-generated/zaqar/:/var/lib/kolla/config_files/src:ro
                       - /var/log/containers/zaqar:/var/log/zaqar
+                      - /var/log/containers/httpd/zaqar:/var/log/httpd
                 environment:
                   - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent logs directory
           file:
-            path: /var/log/containers/zaqar
+            path: "{{ item }}"
             state: directory
+          with_items:
+            - /var/log/containers/zaqar
+            - /var/log/containers/httpd/zaqar
       upgrade_tasks:
         - name: Stop and disable zaqar service
           tags: step2