Add support for running crontabs in containers

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

diff --git a/docker/services/tacker.yaml b/docker/services/tacker.yaml
index df9750c..793a174 100644 (file)
--- a/docker/services/tacker.yaml
+++ b/docker/services/tacker.yaml
@@ -13,7 +13,7 @@ parameters:
     default: 'centos-binary-tacker:latest'
     type: string
   DockerTackerConfigImage:
-    description: image
+    description: The container image to use for the tacker config_volume
     default: 'centos-binary-tacker:latest'
     type: string
   EndpointMap:
@@ -76,6 +76,11 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/tacker_api.json:
           command: /usr/bin/tacker-server --config-file=/etc/tacker/tacker.conf --log-file=/var/log/tacker/api.log
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/log/tacker
               owner: tacker:tacker
@@ -104,7 +109,10 @@ outputs:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
-                  - /var/lib/config-data/tacker/etc/:/etc/:ro
+                  # FIXME(mandre) mounting /etc rw to workaround LP1696283
+                  # This should go away anyway and mount the exact files it
+                  # needs or use kolla set_configs.py
+                  - /var/lib/config-data/tacker/etc/:/etc/
                   - /var/log/containers/tacker:/var/log/tacker
             command: "/usr/bin/bootstrap_host_exec tacker su tacker -s /bin/bash -c 'tacker-db-manage --config-file /etc/tacker/tacker.conf upgrade head'"
         step_4:
@@ -118,7 +126,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/tacker_api.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/tacker/etc/tacker/:/etc/tacker/:ro
+                  - /var/lib/config-data/puppet-generated/tacker/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/tacker:/var/log/tacker
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS