summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Fulton <fulton@redhat.com>2017-08-02 02:54:56 +0000
committerJohn Fulton <fulton@redhat.com>2017-08-02 02:54:56 +0000
commit50c1187375a468ed7224f05391490b38c655b8fd (patch)
tree3ef05a008f87d30d2853d02777878991e50f2e96
parent56d4563935ce51c54e8a4c38463e6c86dabee889 (diff)
Cinder volume/backup containers shouldn't mount two paths at same point
Docker refuses to start the container because config_files/src-ceph:ro is mounted at both /etc/ceph and config-data/puppet-generated/ceph. The mount to /var/lib/config-data/puppet-generated/ceph should have been removed in commit ed0b77ff93a1a1e071d32f6a758e04c6d0b041ef. Change-Id: I411b4764a54fc21e97e4c41a5fef00c7e6e2b64d Closes-Bug: #1707956
-rw-r--r--docker/services/cinder-backup.yaml1
-rw-r--r--docker/services/cinder-volume.yaml1
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/