Merge "Make CephValidationDelay/Retries default consistent"

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

diff --git a/docker/services/cinder-scheduler.yaml b/docker/services/cinder-scheduler.yaml
index 8199c34..8281385 100644 (file)
--- a/docker/services/cinder-scheduler.yaml
+++ b/docker/services/cinder-scheduler.yaml
@@ -12,9 +12,8 @@ parameters:
     description: image
     default: 'centos-binary-cinder-scheduler:latest'
     type: string
-  # we configure all cinder services in the same cinder base container
   DockerCinderConfigImage:
-    description: image
+    description: The container image to use for the cinder config_volume
     default: 'centos-binary-cinder-api:latest'
     type: string
   EndpointMap:
@@ -76,6 +75,11 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/cinder_scheduler.json:
           command: /usr/bin/cinder-scheduler --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/log/cinder
               owner: cinder:cinder
@@ -103,7 +107,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/cinder_scheduler.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/cinder/etc/cinder/:/etc/cinder/:ro
+                  - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/cinder:/var/log/cinder
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS