Merge "Containers: Bind mount directories with the key/certs for heat"

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

diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index 53460a8..944646e 100644 (file)
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack containerized Nova Placement API service
@@ -10,7 +10,7 @@ parameters:
     type: string
   DockerNovaPlacementImage:
     description: image
-    default: 'centos-binary-nova-placement-api'
+    default: 'centos-binary-nova-placement-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -63,6 +63,10 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/nova_placement.json:
           command: /usr/sbin/httpd -DFOREGROUND
+          permissions:
+            - path: /var/log/nova
+              owner: nova:nova
+              recurse: true
       docker_config:
         # start this early so it is up before computes start reporting
         step_3:
@@ -73,17 +77,21 @@ outputs:
             user: root
             restart: always
             volumes:
-              yaql:
-                expression: $.data.common.concat($.data.service)
-                data:
-                  common: {get_attr: [ContainersCommon, volumes]}
-                  service:
-                    - /var/lib/kolla/config_files/nova_placement.json:/var/lib/kolla/config_files/config.json:ro
-                    - /var/lib/config-data/nova_placement/etc/nova/:/etc/nova/:ro
-                    - /var/lib/config-data/nova_placement/etc/httpd/:/etc/httpd/:ro
-                    - /var/lib/config-data/nova_placement/var/www/:/var/www/:ro
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/nova_placement.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/nova_placement/etc/nova/:/etc/nova/:ro
+                  - /var/lib/config-data/nova_placement/etc/httpd/:/etc/httpd/:ro
+                  - /var/lib/config-data/nova_placement/var/www/:/var/www/:ro
+                  - /var/log/containers/nova:/var/log/nova
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      host_prep_tasks:
+        - name: create persistent logs directory
+          file:
+            path: /var/log/containers/nova
+            state: directory
       upgrade_tasks:
         - name: Stop and disable nova_placement service (running under httpd)
           tags: step2