diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-10 17:20:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-10 17:20:09 +0000 |
| commit | 322f2dbd4c1d9c8617186bcb9211d7a1fe10ba3f (patch) | |
| tree | c0714854a4d02dfb8d74a2d48f5959ee89adf028 /docker/services/cinder-volume.yaml | |
| parent | 83defdbdbf12a4ba9d843cd115d1acb931d1d151 (diff) | |
| parent | cf18e865d14adc319b6c2dfafd650f32dad4d853 (diff) | |
Merge "Copy only generated puppet files into the container"
Diffstat (limited to 'docker/services/cinder-volume.yaml')
| -rw-r--r-- | docker/services/cinder-volume.yaml | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml index 55173847..0ce098a3 100644 --- a/docker/services/cinder-volume.yaml +++ b/docker/services/cinder-volume.yaml @@ -83,6 +83,19 @@ outputs: kolla_config: /var/lib/kolla/config_files/cinder_volume.json: command: /usr/bin/cinder-volume --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf + config_files: + # NOTE(mandre): the copy of ceph conf will need to go once we + # generate a ceph.conf for cinder in puppet + # Copy ceph config files before cinder ones as a precaution, for + # the later one to take precendence in case of duplicate files. + - source: "/var/lib/kolla/config_files/src-ceph/*" + dest: "/" + merge: true + preserve_properties: true + - source: "/var/lib/kolla/config_files/src/*" + dest: "/" + merge: true + preserve_properties: true permissions: - path: /var/log/cinder owner: cinder:cinder @@ -111,8 +124,9 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/cinder/etc/cinder/:/etc/cinder/:ro - - /var/lib/config-data/ceph/etc/ceph/:/etc/ceph/:ro #FIXME: we need to generate a ceph.conf with puppet for this + - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro + # FIXME: we need to generate a ceph.conf with puppet for this + - /var/lib/config-data/puppet-generated/ceph/:/var/lib/kolla/config_files/src-ceph:ro - /dev/:/dev/ - /run/:/run/ - /sys:/sys |