Merge "Fix wrong permission on database during mysql_init tasks." into stable/pike

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

diff --git a/docker/services/manila-api.yaml b/docker/services/manila-api.yaml
index c33f409..d2360f9 100644 (file)
--- a/docker/services/manila-api.yaml
+++ b/docker/services/manila-api.yaml
@@ -42,6 +42,9 @@ resources:
   ContainersCommon:
     type: ./containers-common.yaml
 
+  MySQLClient:
+    type: ../../puppet/services/database/mysql-client.yaml
+
   ManilaApiPuppetBase:
     type: ../../puppet/services/manila-api.yaml
     properties:
@@ -56,8 +59,13 @@ outputs:
     value:
       service_name: {get_attr: [ManilaApiPuppetBase, role_data, service_name]}
       config_settings: {get_attr: [ManilaApiPuppetBase, role_data, config_settings]}
+      logging_source: {get_attr: [ManilaApiPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [ManilaApiPuppetBase, role_data, logging_groups]}
       step_config: &step_config
-        {get_attr: [ManilaApiPuppetBase, role_data, step_config]}
+        list_join:
+          - "\n"
+          - - {get_attr: [ManilaApiPuppetBase, role_data, step_config]}
+            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [ManilaApiPuppetBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS #
       puppet_config:
@@ -84,7 +92,8 @@ outputs:
             user: root
             volumes:
               - /var/log/containers/manila:/var/log/manila
-            command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R manila:manila /var/log/manila']
+              - /var/log/containers/httpd/manila-api:/var/log/httpd
+            command: ['/bin/bash', '-c', 'chown -R manila:manila /var/log/manila']
         step_3:
           manila_api_db_sync:
             user: root
@@ -97,6 +106,7 @@ outputs:
                 -
                   - /var/lib/config-data/manila/etc/manila/:/etc/manila/:ro
                   - /var/log/containers/manila:/var/log/manila
+                  - /var/log/containers/httpd/manila-api:/var/log/httpd
             command: "/usr/bin/bootstrap_host_exec manila_api su manila -s /bin/bash -c '/usr/bin/manila-manage db sync'"
         step_4:
           manila_api:
@@ -110,13 +120,17 @@ outputs:
                   - /var/lib/kolla/config_files/manila_api.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/manila/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/manila:/var/log/manila
+                  - /var/log/containers/httpd/manila-api:/var/log/httpd
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
         - name: Create persistent manila logs directory
           file:
-            path: /var/log/containers/manila
+            path: "{{ item }}"
             state: directory
+          with_items:
+            - /var/log/containers/manila
+            - /var/log/containers/httpd/manila-api
       upgrade_tasks:
         - name: Stop and disable manila_api service
           tags: step2