Merge "mysql: Only set certificate specs if TLS everywhere is enabled" into stable...

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

diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml
index 9e38b06..75d0b8c 100644 (file)
--- a/docker/services/heat-api.yaml
+++ b/docker/services/heat-api.yaml
@@ -71,6 +71,8 @@ outputs:
           - apache::default_vhost: false
       step_config: &step_config
         get_attr: [HeatBase, role_data, step_config]
+      logging_source: {get_attr: [HeatBase, role_data, logging_source]}
+      logging_groups: {get_attr: [HeatBase, role_data, logging_groups]}
       service_config_settings: {get_attr: [HeatBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
@@ -118,6 +120,7 @@ outputs:
                   - /var/lib/kolla/config_files/heat_api.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/heat_api/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/heat:/var/log/heat
+                  - /var/log/containers/httpd/heat-api:/var/log/httpd
                   -
                     if:
                       - internal_tls_enabled
@@ -136,6 +139,8 @@ outputs:
             user: root
             privileged: false
             restart: always
+            healthcheck:
+              test: /bin/true
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
@@ -143,19 +148,27 @@ outputs:
                   - /var/lib/kolla/config_files/heat_api_cron.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/heat_api/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/heat:/var/log/heat
+                  - /var/log/containers/httpd/heat-api:/var/log/httpd
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent logs directory
           file:
-            path: /var/log/containers/heat
+            path: "{{ item }}"
             state: directory
+          with_items:
+            - /var/log/containers/heat
+            - /var/log/containers/httpd/heat-api
       upgrade_tasks:
         - name: Check is heat_api is deployed
           command: systemctl is-enabled openstack-heat-api
           tags: common
           ignore_errors: True
           register: heat_api_enabled
+        - name: remove old heat cron jobs
+          file:
+            path: /var/spool/cron/heat
+            state: absent
         - name: check for heat_api running under apache (post upgrade)
           tags: step2
           shell: "httpd -t -D DUMP_VHOSTS | grep -q heat_api_wsgi"