Merge "Remove package if service stopped and disabled" into stable/pike

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

diff --git a/docker/services/octavia-api.yaml b/docker/services/octavia-api.yaml
index 86730eb..c5e729c 100644 (file)
--- a/docker/services/octavia-api.yaml
+++ b/docker/services/octavia-api.yaml
@@ -69,6 +69,8 @@ outputs:
     value:
       service_name: {get_attr: [OctaviaApiPuppetBase, role_data, service_name]}
       config_settings: {get_attr: [OctaviaApiPuppetBase, role_data, config_settings]}
+      logging_source: {get_attr: [OctaviaApiPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [OctaviaApiPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"
@@ -111,6 +113,7 @@ outputs:
               # configuration.
               - /var/lib/config-data/puppet-generated/octavia/etc/octavia:/etc/octavia/
               - /var/log/containers/octavia:/var/log/octavia
+              - /var/log/containers/httpd/octavia-api:/var/log/httpd
             command: ['/bin/bash', '-c', 'mkdir -p /etc/octavia/conf.d/octavia-api; chown -R octavia:octavia /etc/octavia/conf.d/octavia-api; chown -R octavia:octavia /var/log/octavia']
         step_3:
           octavia_db_sync:
@@ -126,6 +129,7 @@ outputs:
                 -
                   - /var/lib/config-data/octavia/etc/octavia/:/etc/octavia/:ro
                   - /var/log/containers/octavia:/var/log/octavia
+                  - /var/log/containers/httpd/octavia-api:/var/log/httpd
             command: "/usr/bin/bootstrap_host_exec octavia_api su octavia -s /bin/bash -c '/usr/bin/octavia-db-manage upgrade head'"
         step_4:
           map_merge:
@@ -142,6 +146,7 @@ outputs:
                       - /var/lib/kolla/config_files/octavia_api.json:/var/lib/kolla/config_files/config.json:ro
                       - /var/lib/config-data/puppet-generated/octavia/:/var/lib/kolla/config_files/src:ro
                       - /var/log/containers/octavia:/var/log/octavia
+                      - /var/log/containers/httpd/octavia-api:/var/log/httpd
                 environment:
                   - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
             - if:
@@ -166,8 +171,11 @@ outputs:
       host_prep_tasks:
         - name: create persistent logs directory
           file:
-            path: /var/log/containers/octavia
+            path: "{{ item }}"
             state: directory
+          with_items:
+            - /var/log/containers/octavia
+            - /var/log/containers/httpd/octavia-api
       upgrade_tasks:
         - name: Stop and disable octavia_api service
           tags: step2