Merge "Enable redis TLS proxy in HA deployments" into stable/pike

[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 4a25096..2bb588d 100644 (file)
--- a/docker/services/heat-api.yaml
+++ b/docker/services/heat-api.yaml
@@ -4,18 +4,12 @@ description: >
   OpenStack containerized Heat API service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerHeatApiImage:
     description: image
-    default: 'centos-binary-heat-api:latest'
     type: string
   # puppet needs the heat-wsgi-api binary from centos-binary-heat-api
   DockerHeatApiConfigImage:
     description: The container image to use for the heat_api config_volume
-    default: 'centos-binary-heat-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -83,10 +77,7 @@ outputs:
         config_volume: heat_api
         puppet_tags: heat_config,file,concat,file_line
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerHeatApiConfigImage} ]
+        config_image: {get_param: DockerHeatApiConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/heat_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -99,13 +90,21 @@ outputs:
             - path: /var/log/heat
               owner: heat:heat
               recurse: true
+        /var/lib/kolla/config_files/heat_api_cron.json:
+          command: /usr/sbin/crond -n
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
+          permissions:
+            - path: /var/log/heat
+              owner: heat:heat
+              recurse: true
       docker_config:
         step_4:
           heat_api:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerHeatApiImage} ]
+            image: {get_param: DockerHeatApiImage}
             net: host
             privileged: false
             restart: always
@@ -119,6 +118,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
@@ -131,14 +131,56 @@ outputs:
                       - ''
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+          heat_api_cron:
+            image: {get_param: DockerHeatApiImage}
+            net: host
+            user: root
+            privileged: false
+            restart: always
+            healthcheck:
+              test: /bin/true
+            volumes:
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /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: Stop and disable heat_api service
+        - 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"
+          register: heat_api_apache
+          ignore_errors: true
+          changed_when: false
+          check_mode: no
+        - name: Stop heat_api service (running under httpd)
+          tags: step2
+          service: name=httpd state=stopped
+          when: heat_api_apache.rc == 0
+        - name: Stop and disable heat_api service (pre-upgrade not under httpd)
           tags: step2
-          service: name=httpd state=stopped enabled=no
+          service: name=openstack-heat-api state=stopped enabled=no
+          when: heat_api_enabled.rc == 0
       metadata_settings:
         get_attr: [HeatBase, role_data, metadata_settings]