diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-03 01:02:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-03 01:02:35 +0000 |
| commit | fbccdd58bca9854a736088dcd73f0837aa400b61 (patch) | |
| tree | f3091a4539ae43bf078a4d5fd1154dfb4d835564 /docker | |
| parent | 010d9ce2ca5aea8e2852ecdf8b0d11d46f2c524c (diff) | |
| parent | 50c1187375a468ed7224f05391490b38c655b8fd (diff) | |
Merge "Cinder volume/backup containers shouldn't mount two paths at same point"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/services/cinder-backup.yaml | 1 | ||||
| -rw-r--r-- | docker/services/cinder-volume.yaml | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/docker/services/cinder-backup.yaml b/docker/services/cinder-backup.yaml index 33147d27..ad3b43c2 100644 --- a/docker/services/cinder-backup.yaml +++ b/docker/services/cinder-backup.yaml @@ -120,7 +120,6 @@ outputs: - /var/lib/kolla/config_files/cinder_backup.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro - - /var/lib/config-data/puppet-generated/ceph/:/var/lib/kolla/config_files/src-ceph:ro - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro - /dev/:/dev/ - /run/:/run/ diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml index 2ead0d50..eb904c0b 100644 --- a/docker/services/cinder-volume.yaml +++ b/docker/services/cinder-volume.yaml @@ -129,7 +129,6 @@ outputs: - /var/lib/kolla/config_files/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro - - /var/lib/config-data/puppet-generated/ceph/:/var/lib/kolla/config_files/src-ceph:ro - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro - /lib/modules:/lib/modules:ro - /dev/:/dev/ |