X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fcinder-api.yaml;h=07315e7e935533b13876969e2fe059e04e655aa2;hb=5b2395a2ed7c5eb0b4f1b5c01467a6c5c095867b;hp=94bd66d8807ecce2d5621deb03e0d3a1eac07279;hpb=96813ba2683552860c68d99931aa77cd6a0bf391;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml
index 94bd66d8..07315e7e 100644
--- a/docker/services/cinder-api.yaml
+++ b/docker/services/cinder-api.yaml
@@ -12,9 +12,8 @@ parameters:
     description: image
     default: 'centos-binary-cinder-api: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:
@@ -82,6 +81,11 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/cinder_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/log/cinder
               owner: cinder:cinder
@@ -129,9 +133,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/cinder_api.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/cinder/etc/cinder/:/etc/cinder/:ro
-                  - /var/lib/config-data/cinder/etc/httpd/:/etc/httpd/:ro
-                  - /var/lib/config-data/cinder/var/www/:/var/www/:ro
+                  - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/cinder:/var/log/cinder
                   -
                     if: